Minor refactoring/fixes

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleGui.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleGui.java
index 074b60d6314972d54a739c48096eb8c54b37fa92..4e0a1a3b9d5f8582509bc2d0980965829ca425cf 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleGui.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/client/BattleGui.java
@@ -229,6 +229,7 @@ public class BattleGui extends Screen {
                if (TurnBasedMinecraftMod.proxy.getLocalBattle() == null) {
                        // drawHoveringText("Waiting...", width / 2 - 50, height / 2);
                        drawString(guiGraphics, "Waiting...", width / 2 - 50, height / 2, 0xFFFFFFFF);
+                       super.render(guiGraphics, mouseX, mouseY, partialTicks);
                        return;
                }
                if (TurnBasedMinecraftMod.proxy.getLocalBattle().getState() == Battle.State.DECISION

diff --git a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java
index b4bd274c0c3e9498444498c555f7f7998f5f4abf..17732233bf7a02e07380b15aed201bd10bff76a2 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java
@@ -26,10 +26,10 @@ public class BattleUpdater
 
     @SubscribeEvent
     public void update(TickEvent.ServerTickEvent tickEvent) {
-        if(tickEvent.phase != TickEvent.Phase.START && isRunning.get() && ++tick > tickLimit) {
+        if(tickEvent.phase != TickEvent.Phase.START && isRunning.get() && ++tick > tickLimit && tickEvent.haveTime()) {
             tick = 0;
             manager.battleMap.entrySet().removeIf(entry -> entry.getValue().update());
             manager.updateRecentlyLeftBattle();
         }
     }
-}
\ No newline at end of file
+}