Skip to content

Fix the AI monologue bug, fix listening for event that won't fire #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
qrmcat wants to merge 1 commit into from
Closed

Fix the AI monologue bug, fix listening for event that won't fire #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/main/java/cc/reconnected/chatbox/ClientPacketsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import cc.reconnected.chatbox.utils.Webhook;
import cc.reconnected.chatbox.ws.ClientErrors;
import cc.reconnected.library.data.PlayerMeta;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
Expand Down Expand Up @@ -55,6 +54,13 @@ private static void tickQueue(MinecraftServer server) {
continue;
}

// anti-ai-monologue-bug!
// (also known as "we can't even yell back to the client because it disconnected")
if( msg.conn.isClosed()) {
messageQueue.remove(uuid);
continue;
}

if (msg.type == MessageTypes.SAY) {
Webhook.send(uuid, msg, null);
mcServer.getPlayerList().getPlayers().forEach(player -> player.sendMessage(msg.message));
Expand Down Expand Up @@ -102,8 +108,8 @@ private static String enqueueAndResult(UUID licenseId, ClientMessage message, in
}
}

public static void register() {
ServerLifecycleEvents.SERVER_STARTING.register(server -> mcServer = server);
public static void register(MinecraftServer server) {
mcServer = server;
ServerTickEvents.END_SERVER_TICK.register(ClientPacketsHandler::tickQueue);

ChatboxMessageEvents.SAY.register((client, packet) -> {
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/cc/reconnected/chatbox/listeners/ChatboxEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ public static void register(MinecraftServer serverStarting) {
SolsticeEvents.register();
}

ClientPacketsHandler.register();
// Bomber: I would like to have a few words with whoever decided to try listening to the server starting
// event INSIDE ClientPacketsHandler's register method... that is only run after the server starting event
// has fired...
ClientPacketsHandler.register(serverStarting);
ClientConnectionEvents.CONNECT.register((conn, license, isGuest) -> {
var playerData = PlayerMeta.getPlayer(license.userId());

Expand Down