From 02a1813206b694d7d8903a30cdb57a2bc3aba815 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Tue, 17 May 2016 18:30:58 +0800
Subject: [PATCH] Fix magma cubes, slimes, and pathfinding for some mobs

---
 .../npc/entity/MagmaCubeController.java            | 14 ++++----------
 .../citizensnpcs/npc/entity/SlimeController.java   | 12 ++----------
 .../citizensnpcs/npc/entity/SnowmanController.java |  3 ++-
 src/main/java/net/citizensnpcs/util/NMS.java       |  3 +--
 src/main/java/net/citizensnpcs/util/Util.java      |  2 +-
 5 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java
index 4b9ef33e3..8a75ec0c3 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/MagmaCubeController.java
@@ -72,13 +72,6 @@ public class MagmaCubeController extends MobEntityController {
                             npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bT()).toString())));
         }
 
-        @Override
-        public void ci() {
-            if (npc == null) {
-                super.ci();
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_9_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -182,10 +175,11 @@ public class MagmaCubeController extends MobEntityController {
         }
 
         @Override
-        public void M() {
-            super.M();
-            if (npc != null)
+        public void m() {
+            super.m();
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
diff --git a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java
index 547337a99..6ecea24c3 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/SlimeController.java
@@ -26,7 +26,6 @@ import net.minecraft.server.v1_9_R2.SoundEffect;
 import net.minecraft.server.v1_9_R2.World;
 
 public class SlimeController extends MobEntityController {
-
     public SlimeController() {
         super(EntitySlimeNPC.class);
     }
@@ -74,13 +73,6 @@ public class SlimeController extends MobEntityController {
                             npc.data().get(NPC.DEATH_SOUND_METADATA, SoundEffect.a.b(super.bT()).toString())));
         }
 
-        @Override
-        public void ci() {
-            if (npc == null) {
-                super.ci();
-            }
-        }
-
         @Override
         public void collide(net.minecraft.server.v1_9_R2.Entity entity) {
             // this method is called by both the entities involved - cancelling
@@ -192,8 +184,8 @@ public class SlimeController extends MobEntityController {
         }
 
         @Override
-        public void M() {
-            super.M();
+        public void m() {
+            super.m();
             if (npc != null) {
                 npc.update();
             }
diff --git a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java
index fff487a90..5087dc177 100644
--- a/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java
+++ b/src/main/java/net/citizensnpcs/npc/entity/SnowmanController.java
@@ -174,8 +174,9 @@ public class SnowmanController extends MobEntityController {
         @Override
         public void M() {
             super.M();
-            if (npc != null)
+            if (npc != null) {
                 npc.update();
+            }
         }
 
         @Override
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
index 2b4a061ac..37a77ce4c 100644
--- a/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -181,7 +181,6 @@ public class NMS {
      * an Exception like it should.
      */
     public static GameProfile fillProfileProperties(GameProfile profile, boolean requireSecure) throws Exception {
-
         if (Bukkit.isPrimaryThread())
             throw new IllegalStateException("NMS.fillProfileProperties cannot be invoked from the main thread.");
 
@@ -741,7 +740,7 @@ public class NMS {
         yaw = clampYaw(yaw);
         handle.aO = yaw;
         if (!(handle instanceof EntityHuman))
-            handle.aM = yaw;
+            handle.aN = yaw;
         handle.aP = yaw;
     }
 
diff --git a/src/main/java/net/citizensnpcs/util/Util.java b/src/main/java/net/citizensnpcs/util/Util.java
index 9a091ef74..79c795f1e 100644
--- a/src/main/java/net/citizensnpcs/util/Util.java
+++ b/src/main/java/net/citizensnpcs/util/Util.java
@@ -126,7 +126,7 @@ public class Util {
         }
         for (T check : values) {
             String name = check.name().toLowerCase();
-            if (name.replace("_", "").equals(toMatch) || name.matches(toMatch) || name.startsWith(toMatch)) {
+            if (name.replace("_", "").equals(toMatch) || name.startsWith(toMatch)) {
                 return check;
             }
         }