Fix dangling else in the listener, and no more NPEs for setclass command.

resources/plugin.yml

@@ -1,7 +1,7 @@
 name: MobArena
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.94.4.80
+version: 0.94.4.81
 softdepend: [Spout,MultiVerse,MultiWorld,XcraftGate,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:

src/com/garbagemule/MobArena/ArenaListener.java

@@ -607,21 +607,24 @@ public class ArenaListener
         }
 
         else if (monsters.getMonsters().contains(event.getEntity())) {
-            if (event.getReason() == TargetReason.FORGOT_TARGET)
+            if (event.getReason() == TargetReason.FORGOT_TARGET) {
                 event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena));
-
+            }
-            else if (event.getReason() == TargetReason.TARGET_DIED)
+            else if (event.getReason() == TargetReason.TARGET_DIED) {
                 event.setTarget(MAUtils.getClosestPlayer(plugin, event.getEntity(), arena));
-
+            }
-            else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY)
+            else if (event.getReason() == TargetReason.TARGET_ATTACKED_ENTITY) {
-                if (arena.hasPet(event.getTarget()))
+                if (arena.hasPet(event.getTarget())) {
                     event.setCancelled(true);
-
+                }
-                else if (event.getReason() == TargetReason.CLOSEST_PLAYER)
+            }
-                    if (!arena.inArena((Player) event.getTarget()))
+            else if (event.getReason() == TargetReason.CLOSEST_PLAYER) {
+                if (!arena.inArena((Player) event.getTarget())) {
                     event.setCancelled(true);
                 }
             }
+        }
+    }
     
     public void onEntityTeleport(EntityTeleportEvent event) {
         if (region.contains(event.getFrom()) || region.contains(event.getTo())) {

src/com/garbagemule/MobArena/ArenaMasterImpl.java

@@ -390,7 +390,7 @@ public class ArenaMasterImpl implements ArenaMaster
 
         // If the helmet isn't a real helmet, set it explicitly.
         ItemStack helmet = inv.getHelmet();
-        if (helmet.getTypeId() != 0 && ArmorType.getType(helmet) != ArmorType.HELMET) {
+        if (helmet != null && ArmorType.getType(helmet) != ArmorType.HELMET) {
             section.set("helmet", ItemParser.parseString(helmet));
         }