Fixed #61

MinecraftFreecam · Dec 19, 2022 · 344bf9e · 344bf9e
1 parent aab7bf8
commit 344bf9e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/net/xolt/freecam/Freecam.java b/src/main/java/net/xolt/freecam/Freecam.java
@@ -28,6 +28,7 @@ public class Freecam implements ClientModInitializer {
     private static boolean freecamEnabled = false;
     private static boolean tripodEnabled = false;
     private static boolean playerControlEnabled = false;
+    private static boolean disableNextTick = false;
     private static Integer activeTripod = null;
     private static FreeCamera freeCamera;
     private static HashMap<Integer, FreecamPosition> overworld_tripods = new HashMap<>();
@@ -254,6 +255,14 @@ public static KeyBinding getTripodResetBind() {
         return tripodResetBind;
     }
 
+    public static boolean disableNextTick() {
+        return disableNextTick;
+    }
+
+    public static void setDisableNextTick(boolean damage) {
+        disableNextTick = damage;
+    }
+
     public static boolean isEnabled() {
         return freecamEnabled || tripodEnabled;
     }

diff --git a/src/main/java/net/xolt/freecam/mixins/ClientPlayerEntityMixin.java b/src/main/java/net/xolt/freecam/mixins/ClientPlayerEntityMixin.java
@@ -24,10 +24,8 @@ private void onIsCamera(CallbackInfoReturnable<Boolean> cir) {
     // Disables freecam upon receiving damage if disableOnDamage is enabled.
     @Inject(method = "damage", at = @At("HEAD"))
     private void onDamage(CallbackInfoReturnable<Boolean> cir) {
-        if (ModConfig.INSTANCE.disableOnDamage && this.equals(MC.player)) {
-            if (Freecam.isEnabled()) {
-                Freecam.toggle();
-            }
+        if (Freecam.isEnabled() && ModConfig.INSTANCE.disableOnDamage && this.equals(MC.player)) {
+            Freecam.setDisableNextTick(true);
         }
     }
 }
diff --git a/src/main/java/net/xolt/freecam/mixins/MinecraftClientMixin.java b/src/main/java/net/xolt/freecam/mixins/MinecraftClientMixin.java
@@ -26,6 +26,11 @@ private void onTick(CallbackInfo ci) {
                 MC.player.input = input;
             }
             MC.gameRenderer.setRenderHand(ModConfig.INSTANCE.showHand);
+
+            if (Freecam.disableNextTick()) {
+                Freecam.toggle();
+                Freecam.setDisableNextTick(false);
+            }
         }
     }