]> git.seodisparate.com - TurnBasedMinecraftMod/commitdiff
Minor refactoring
authorStephen Seo <seo.disparate@gmail.com>
Fri, 25 Oct 2024 06:23:44 +0000 (15:23 +0900)
committerStephen Seo <seo.disparate@gmail.com>
Fri, 25 Oct 2024 06:24:19 +0000 (15:24 +0900)
Do not create Battle instance client-side from received "Ping" packet.

src/main/java/com/burnedkirby/TurnBasedMinecraft/common/networking/PacketBattlePing.java

index 1901bd0caf35a5b04c13865712fb1236395d895e..46e1bf87425c8a8f3746e9c6e927ee6cbf005d8d 100644 (file)
@@ -31,13 +31,12 @@ public record PacketBattlePing(int battleID, int remainingSeconds) implements Cu
         @Override
         public void handle(final @NotNull PacketBattlePing pkt, IPayloadContext ctx) {
             ctx.enqueueWork(() -> {
-                if (TurnBasedMinecraftMod.proxy.getLocalBattle() == null) {
-                    TurnBasedMinecraftMod.proxy.createLocalBattle(pkt.battleID);
+                if (TurnBasedMinecraftMod.proxy.getLocalBattle() != null) {
+                    TurnBasedMinecraftMod.proxy.setBattleGuiAsGui();
+                    TurnBasedMinecraftMod.proxy.setBattleGuiBattleChanged();
+                    TurnBasedMinecraftMod.proxy.setBattleGuiTime(pkt.remainingSeconds);
+                    TurnBasedMinecraftMod.proxy.pauseMCMusic();
                 }
-                TurnBasedMinecraftMod.proxy.setBattleGuiAsGui();
-                TurnBasedMinecraftMod.proxy.setBattleGuiBattleChanged();
-                TurnBasedMinecraftMod.proxy.setBattleGuiTime(pkt.remainingSeconds);
-                TurnBasedMinecraftMod.proxy.pauseMCMusic();
             }).exceptionally(e -> {
                 ctx.disconnect(Component.literal("Exception handling PacketBattlePing! " + e.getMessage()));
                 return null;