From dd2ec4c15731eab1f7a5237ca18213747d08e159 Mon Sep 17 00:00:00 2001 From: Brian Date: Thu, 7 Jun 2012 21:17:02 -0400 Subject: [PATCH] fix an NPE, order matters! --- MobArena.jar | Bin 343724 -> 343724 bytes .../garbagemule/MobArena/ArenaListener.java | 15 +++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index 68bbbfb09697476501c0765ea498ed3cbc5f541b..2e26df030506af7fec8bc55bb29bedfdb7294bd8 100644 GIT binary patch delta 44 zcmZ4US7gm!5uN~VW)=|!4j^P$)yUJz!`RBh)XKxWm51f-8zzQT+h4z7IT#24Ajb|H delta 44 zcmZ4US7gm!5uN~VW)=|!4j?RB*~rt%!`RBh)XKxWm51f-8>X_A+h4z7IT#24Fvt%D diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java index 6c71c2c..33f2ba8 100644 --- a/src/com/garbagemule/MobArena/ArenaListener.java +++ b/src/com/garbagemule/MobArena/ArenaListener.java @@ -792,9 +792,13 @@ public class ArenaListener ArenaClass oldAC = arena.getArenaPlayer(p).getArenaClass(); ArenaClass newAC = arena.getClasses().get(className); - // If they picked the same sign, don't do anything - if (oldAC.equals(newAC)) { - return; + // If they already had a class, make sure to change the "in use" in the Class Limit Manager + if (oldAC != null) { + // If they picked the same sign, don't do anything + if (oldAC.equals(newAC)) { + return; + } + classLimits.playerChangedClass(oldAC); } // If they can not join the class, deny them @@ -803,11 +807,6 @@ public class ArenaListener return; } - // If they already had a class, make sure to change the "in use" in the Class Limit Manager - if (oldAC != null) { - classLimits.playerChangedClass(oldAC); - } - // Increment the "in use" in the Class Limit Manager classLimits.playerPickedClass(newAC);