Fix falling perpetually with Freeze mode, fixes

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleMusic.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleMusic.java
index 47f13246356e1738cb4dbb1fbe1892c4266c3a06..b448dfb6bea819cc45833170f21033003a24969f 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleMusic.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/client/BattleMusic.java
@@ -148,7 +148,7 @@ public class BattleMusic
     
     public void playBattle(float volume)
     {
-        if(!initialized || volume <= 0.0f)
+        if(!initialized || volume <= 0.0f || battleMusic.isEmpty())
         {
             return;
         }
@@ -163,7 +163,7 @@ public class BattleMusic
     
     public void playSilly(float volume)
     {
-        if(!initialized || volume <= 0.0f)
+        if(!initialized || volume <= 0.0f || sillyMusic.isEmpty())
         {
             return;
         }

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
index bf1eea5c227b8053c993364f72338c02ebf02b5d..f69aa1c11d439d3b58eca02c09b600d7fd08a584 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Battle.java
@@ -147,7 +147,6 @@ public class Battle
                 if(TurnBasedMinecraftMod.config.isFreezeCombatantsEnabled())
                 {
                     newCombatant.x = e.posX;
-                    newCombatant.y = e.posY;
                     newCombatant.z = e.posZ;
                     newCombatant.yaw = e.rotationYaw;
                     newCombatant.pitch = e.rotationPitch;
@@ -176,7 +175,6 @@ public class Battle
                 if(TurnBasedMinecraftMod.config.isFreezeCombatantsEnabled())
                 {
                     newCombatant.x = e.posX;
-                    newCombatant.y = e.posY;
                     newCombatant.z = e.posZ;
                     newCombatant.yaw = e.rotationYaw;
                     newCombatant.pitch = e.rotationPitch;
@@ -270,7 +268,6 @@ public class Battle
         if(TurnBasedMinecraftMod.config.isFreezeCombatantsEnabled())
         {
             newCombatant.x = e.posX;
-            newCombatant.y = e.posY;
             newCombatant.z = e.posZ;
             newCombatant.yaw = e.rotationYaw;
             newCombatant.pitch = e.rotationPitch;
@@ -310,7 +307,6 @@ public class Battle
         if(TurnBasedMinecraftMod.config.isFreezeCombatantsEnabled())
         {
             newCombatant.x = e.posX;
-            newCombatant.y = e.posY;
             newCombatant.z = e.posZ;
             newCombatant.yaw = e.rotationYaw;
             newCombatant.pitch = e.rotationPitch;
@@ -574,11 +570,11 @@ public class Battle
     {
         for(Combatant c : sideA.values())
         {
-            c.entity.setPositionAndRotation(c.x, c.y, c.z, c.yaw, c.pitch);
+            c.entity.setPositionAndRotation(c.x, c.entity.posY, c.z, c.yaw, c.pitch);
         }
         for(Combatant c : sideB.values())
         {
-            c.entity.setPositionAndRotation(c.x, c.y, c.z, c.yaw, c.pitch);
+            c.entity.setPositionAndRotation(c.x, c.entity.posY, c.z, c.yaw, c.pitch);
         }
     }
     

diff --git a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Combatant.java b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Combatant.java
index d2ac975eed59629a29cd358792beeb70bf30d20e..ab4805a5901e902721ca7d20752705b244a6f38a 100644 (file)
--- a/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Combatant.java
+++ b/src/main/java/com/seodisparate/TurnBasedMinecraft/common/Combatant.java
@@ -20,7 +20,7 @@ public class Combatant
     public int remainingDefenses;
     public int battleID;
     public double x;
-    public double y;
+    //public double y; // y is ignored to prevent perpetual fall damage when FreezeBattleCombatants is enabled
     public double z;
     public float yaw;
     public float pitch;