Sync thirst and temperature on dimension change. Closes #782, #757

Glitchfiend · Nov 23, 2023 · d555e3c · d555e3c
1 parent 8c440ad
commit d555e3c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/main/java/toughasnails/temperature/TemperatureHandler.java b/src/main/java/toughasnails/temperature/TemperatureHandler.java
@@ -63,6 +63,15 @@ public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event)
         syncTemperature((ServerPlayer)event.getEntity());
     }
 
+    @SubscribeEvent
+    public void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event)
+    {
+        if (event.getEntity().level().isClientSide())
+            return;
+
+        syncTemperature((ServerPlayer)event.getEntity());
+    }
+
     @SubscribeEvent
     public void onPlayerCloned(PlayerEvent.Clone event)
     {
@@ -113,7 +122,7 @@ public void onPlayerTick(TickEvent.PlayerTickEvent event)
             int changeDelay = TemperatureConfig.temperatureChangeDelay.get();
             TemperatureLevel currentTargetLevel = data.getTargetLevel();
             TemperatureLevel newTargetLevel = TemperatureHelper.getTemperatureAtPos(player.level(), player.blockPosition());
-            
+
             // Apply modifiers in the configured order
             for (BuiltInTemperatureModifier modifier : TemperatureConfig.getTemperatureModifierOrder())
             {

diff --git a/src/main/java/toughasnails/thirst/ThirstHandler.java b/src/main/java/toughasnails/thirst/ThirstHandler.java
@@ -74,6 +74,15 @@ public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event)
         syncThirst((ServerPlayer)event.getEntity());
     }
 
+    @SubscribeEvent
+    public void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event)
+    {
+        if (event.getEntity().level().isClientSide())
+            return;
+
+        syncThirst((ServerPlayer)event.getEntity());
+    }
+
     @SubscribeEvent
     public void onPlayerTick(TickEvent.PlayerTickEvent event)
     {