Merging 1.7.5 Source: actors/mobs changes

2015-02-02 02:02:48 -05:00
parent e951b7aad8
commit d7934760c5
7 changed files with 209 additions and 26 deletions
@@ -68,10 +68,9 @@ public class Spinner extends Mob {
    protected boolean act() {
        boolean result = super.act();

-        if (state == FLEEING && buff(Terror.class) == null &&
-                enemySeen && enemy.buff(Poison.class) == null) {
-
-            state = HUNTING;
+        if (state == FLEEING && buff( Terror.class ) == null &&
+                enemy != null && enemySeen && enemy.buff( Poison.class ) == null) {
+                state = HUNTING;
        }
        return result;
    }