From fd5be195a87a8871d5a2db50a7d96378a401d739 Mon Sep 17 00:00:00 2001 From: Garbage Mule Date: Sun, 25 Sep 2011 20:49:58 +0200 Subject: [PATCH] arenaMap in ArenaMaster moved to avoid NPE in onDisable --- MobArena.jar | Bin 230934 -> 230926 bytes resources/plugin.yml | 2 +- src/com/garbagemule/MobArena/ArenaMaster.java | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MobArena.jar b/MobArena.jar index af23582076b44db554d0cf5f2c9dd1e85aa50255..c18ef7e865648f0e3f1427ed2370c87122367da1 100644 GIT binary patch delta 10373 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 diff --git a/resources/plugin.yml b/resources/plugin.yml index d78fc87..eedc981 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.94.3.3 +version: 0.94.3.4 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells] commands: ma: diff --git a/src/com/garbagemule/MobArena/ArenaMaster.java b/src/com/garbagemule/MobArena/ArenaMaster.java index fc95a2d..0384455 100644 --- a/src/com/garbagemule/MobArena/ArenaMaster.java +++ b/src/com/garbagemule/MobArena/ArenaMaster.java @@ -50,9 +50,10 @@ public class ArenaMaster //implements Master */ public ArenaMaster(MobArena instance) { - plugin = instance; - config = plugin.getConfig(); - arenas = new LinkedList(); + plugin = instance; + config = plugin.getConfig(); + arenas = new LinkedList(); + arenaMap = new HashMap(); } @@ -254,7 +255,6 @@ public class ArenaMaster //implements Master arenas.add(arena); } - arenaMap = new HashMap(); selectedArena = arenas.get(0); }