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 3d7d56f8f29c04705e8a9e8a323574ead86d74a0..9a8c44115e5e2009ea18fdda1fe2c7226a4d9987 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 c0322464bfebe85d439d9695f5063fa4aaab3078..349efa18c3ab8170293ada9e8b98c2efccca1160 100644 (file)
--- a/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java
+++ b/src/main/java/com/burnedkirby/TurnBasedMinecraft/common/BattleUpdater.java
@@ -27,7 +27,7 @@ public class BattleUpdater
     @SubscribeEvent
     public void update(ServerTickEvent.Post tickEvent) {
         //if(tickEvent.phase != TickEvent.Phase.START && isRunning.get() && ++tick > tickLimit) {
-        if(isRunning.get() && ++tick > tickLimit) {
+        if(isRunning.get() && ++tick > tickLimit && tickEvent.hasTime()) {
             tick = 0;
             manager.battleMap.entrySet().removeIf(entry -> entry.getValue().update());
             manager.updateRecentlyLeftBattle();