diff --git a/resources/plugin.yml b/resources/plugin.yml index 7070bec..1303d5e 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -1,7 +1,7 @@ name: MobArena author: garbagemule main: com.garbagemule.MobArena.MobArena -version: 0.94.4.67 +version: 0.94.4.68 softdepend: [Spout,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells,Vault] commands: ma: diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java index 3e26d79..c82cb04 100644 --- a/src/com/garbagemule/MobArena/ArenaImpl.java +++ b/src/com/garbagemule/MobArena/ArenaImpl.java @@ -601,14 +601,11 @@ public class ArenaImpl implements Arena if (logging) if (ap != null && running) log.playerDeath(ap); - + + restoreInvAndExp(p); if (inLobby(p) || inArena(p)) { - restoreInvAndExp(p); refund(p); } - else if (inSpec(p)) { - inventoryManager.restoreInventory(p); - } movePlayerToEntry(p); discardPlayer(p); @@ -661,7 +658,6 @@ public class ArenaImpl implements Arena if (settings.getBoolean("spectate-on-death", true)) { movePlayerToSpec(p); - //TODO revert if people throw a fit. Should help deter removing valuables from the arena Messenger.tellPlayer(p, Msg.SPEC_FROM_ARENA); Messenger.tellPlayer(p, Msg.MISC_MA_LEAVE_REMINDER); //restoreInvAndExp(p);