Resolve conflicts 1.11.2

src/main/java/mchorse/metamorph/bodypart/MorphBodyPart.java

@@ -28,7 +28,6 @@ public class MorphBodyPart implements IBodyPart
     public float[] rotate = new float[] {180F, 0F, 0F};
     public boolean useTarget = false;
 
-    @SideOnly(Side.CLIENT)
     private EntityLivingBase entity;
 
     @Override

src/main/java/mchorse/metamorph/capabilities/morphing/Morphing.java

@@ -278,14 +278,16 @@ public boolean setCurrentMorph(AbstractMorph morph, EntityPlayer player, boolean
 
         if (force || creative || this.acquiredMorph(morph))
         {
-            if (this.morph == null)
-            {
-                this.lastHealth = (float) player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).getBaseValue();
-            }
-
-            if (player != null && this.morph != null)
+            if (player != null)
             {
-                this.morph.demorph(player);
+                if (this.morph == null)
+                {
+                    this.lastHealth = (float) player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).getBaseValue();
+                }
+                else
+                {
+                    this.morph.demorph(player);
+                }
             }
 
             this.setMorph(morph, player == null ? false : player.world.isRemote);

version.json

@@ -1,29 +1,32 @@
 {
     "homepage":"https://minecraft.curseforge.com/projects/metamorph",
     "1.10.2":{
+        "1.1.10": "This is a small patch update with a couple of bug fixes (mainly by asanetargoss).",
         "1.1.9": "This is a small patch update with lots of awesome bug fixes pull requests from asanetargoss and Johni0702!",
         "1.1.8": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility, but also has some internal changes and few bug fixes.",
         "1.1.7": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility.",
         "1.1.5": "This is a small, quick and dirty patch that provides several bugfixes (mainly for Blockbuster's update)."
     },
     "1.11.2":{
+        "1.1.10": "This is a small patch update with a couple of bug fixes (mainly by asanetargoss).",
         "1.1.9": "This is a small patch update with lots of awesome bug fixes pull requests from asanetargoss and Johni0702!",
         "1.1.8": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility, but also h      as some internal changes and few bug fixes.",
         "1.1.7": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility.",
         "1.1.5": "This is a small, quick and dirty patch that provides several bugfixes (mainly for Blockbuster's update)."
     },
     "1.12.2":{
+        "1.1.10": "This is a small patch update with a couple of bug fixes (mainly by asanetargoss).",
         "1.1.9": "This is a small patch update with lots of awesome bug fixes pull requests from asanetargoss and Johni0702!",
         "1.1.8": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility, but also has some internal changes and few bug fixes.",
         "1.1.7": "This is a small patch update which is mostly oriented toward Blockbuster's compatibility.",
         "1.1.5": "This is a small, quick and dirty patch that provides several bugfixes (mainly for Blockbuster's update)."
     },
     "promos":{
-        "1.10.2-latest":"1.1.9",
-        "1.10.2-recommended":"1.1.9",
-        "1.11.2-latest":"1.1.9",
-        "1.11.2-recommended":"1.1.9",
-        "1.12.2-latest":"1.1.9",
-        "1.12.2-recommended":"1.1.9"
+        "1.10.2-latest":"1.1.10",
+        "1.10.2-recommended":"1.1.10",
+        "1.11.2-latest":"1.1.10",
+        "1.11.2-recommended":"1.1.10",
+        "1.12.2-latest":"1.1.10",
+        "1.12.2-recommended":"1.1.10"
    }
-}
+}