Finally fixed heart bug

mchorse · Oct 21, 2016 · 93746e6 · 93746e6
1 parent 0d0ddd0
commit 93746e6
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 33 deletions.
diff --git a/src/main/java/mchorse/metamorph/ClientProxy.java b/src/main/java/mchorse/metamorph/ClientProxy.java
@@ -13,7 +13,6 @@
 import mchorse.metamorph.entity.EntityMorph;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
 
@@ -82,16 +81,4 @@ public void loadModels()
             }
         }
     }
-
-    /**
-     * Checks if the player is side's own
-     * 
-     * This method is responsible for determining to who player belongs. On 
-     * client side it will return true in case if it's the client's player.
-     */
-    @Override
-    public boolean isOwnPlayer(EntityPlayer player)
-    {
-        return player.worldObj.isRemote ? player == Minecraft.getMinecraft().thePlayer : true;
-    }
 }
diff --git a/src/main/java/mchorse/metamorph/CommonProxy.java b/src/main/java/mchorse/metamorph/CommonProxy.java
@@ -9,7 +9,6 @@
 import mchorse.metamorph.capabilities.morphing.MorphingStorage;
 import mchorse.metamorph.entity.EntityMorph;
 import mchorse.metamorph.network.Dispatcher;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.fml.common.registry.EntityRegistry;
@@ -110,15 +109,4 @@ private void loadModel(String model, String filename)
             e.printStackTrace();
         }
     }
-
-    /**
-     * Checks if the player is side's own
-     * 
-     * This method is responsible for determining to who player belongs. On 
-     * server side it will always return true.
-     */
-    public boolean isOwnPlayer(EntityPlayer player)
-    {
-        return true;
-    }
 }
diff --git a/src/main/java/mchorse/metamorph/api/morph/Morph.java b/src/main/java/mchorse/metamorph/api/morph/Morph.java
@@ -1,6 +1,5 @@
 package mchorse.metamorph.api.morph;
 
-import mchorse.metamorph.Metamorph;
 import mchorse.metamorph.api.IAbility;
 import mchorse.metamorph.api.IAction;
 import mchorse.metamorph.api.IAttackAbility;
@@ -134,11 +133,6 @@ public void demorph(EntityPlayer player)
      */
     private void setHealth(EntityPlayer player, int health)
     {
-        if (!Metamorph.proxy.isOwnPlayer(player))
-        {
-            return;
-        }
-
         float ratio = player.getHealth() / player.getMaxHealth();
         float proportionalHealth = Math.round(health * ratio);
 
@@ -151,7 +145,7 @@ private void setHealth(EntityPlayer player, int health)
      */
     private void setMaxHealth(EntityPlayer player, int health)
     {
-        if (player.getMaxHealth() != health && Metamorph.proxy.isOwnPlayer(player))
+        if (player.getMaxHealth() != health)
         {
             player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(health);
         }

diff --git a/src/main/java/mchorse/metamorph/network/client/ClientHandlerMorphPlayer.java b/src/main/java/mchorse/metamorph/network/client/ClientHandlerMorphPlayer.java
@@ -5,6 +5,7 @@
 import mchorse.metamorph.network.common.PacketMorphPlayer;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -19,7 +20,7 @@ public void run(EntityPlayerSP player, PacketMorphPlayer message)
 
         if (capability != null)
         {
-            capability.setCurrentMorph(message.morph, player, true);
+            capability.setCurrentMorph(message.morph, (EntityPlayer) entity, true);
         }
     }
 }