diff --git a/MobArena.jar b/MobArena.jar index 86938d6..e4b1b40 100644 Binary files a/MobArena.jar and b/MobArena.jar differ diff --git a/bin/plugin.yml b/bin/plugin.yml index ec59d03..007be50 100644 --- a/bin/plugin.yml +++ b/bin/plugin.yml @@ -1,6 +1,6 @@ name: MobArena main: com.garbagemule.MobArena.MobArena -version: 0.87.1 +version: 0.87.2 commands: mobarena: description: Base command for MobArena diff --git a/src/com/garbagemule/MobArena/ArenaManager.java b/src/com/garbagemule/MobArena/ArenaManager.java index 5af4b48..1f8ef84 100644 --- a/src/com/garbagemule/MobArena/ArenaManager.java +++ b/src/com/garbagemule/MobArena/ArenaManager.java @@ -221,7 +221,8 @@ public class ArenaManager return; } - MAUtils.clearInventory(p); + if (ArenaManager.isRunning) + MAUtils.clearInventory(p); if (playerSet.contains(p)) playerSet.remove(p); diff --git a/src/com/garbagemule/MobArena/MAUtils.java b/src/com/garbagemule/MobArena/MAUtils.java index e5c3f02..f696280 100644 --- a/src/com/garbagemule/MobArena/MAUtils.java +++ b/src/com/garbagemule/MobArena/MAUtils.java @@ -208,7 +208,7 @@ public class MAUtils if (c.getKeys("classes") == null) { - c.setProperty("classes.Archer.items", "wood_sword, bow, arrow:64, arrow:64, grilled_pork"); + c.setProperty("classes.Archer.items", "wood_sword, bow, arrow:128, grilled_pork"); c.setProperty("classes.Archer.armor", "298,299,300,301"); c.setProperty("classes.Knight.items", "diamond_sword, grilled_pork"); c.setProperty("classes.Knight.armor", "306,307,308,309"); @@ -694,6 +694,10 @@ public class MAUtils setCoords("spawnpoints.s4", new Location(ArenaManager.world, x2-3, y1+2, z2-3)); } + /** + * This fixes everything! + */ + @SuppressWarnings("unchecked") public static void UnDoooooItHippieMonster() { HashMap preciousPatch; @@ -701,13 +705,13 @@ public class MAUtils { FileInputStream fis = new FileInputStream("plugins/MobArena/precious.tmp"); ObjectInputStream ois = new ObjectInputStream(fis); - preciousPatch = (HashMap) ois.readObject(); + Object o = ois.readObject(); + preciousPatch = (HashMap) ois.readObject(); ois.close(); } catch (Exception e) { System.out.println("Couldn't find backup file..."); - e.printStackTrace(); return; }