Attempt to fix multiworld inventory issues.

resources/plugin.yml

@@ -1,7 +1,7 @@
 name: MobArena
 author: garbagemule
 main: com.garbagemule.MobArena.MobArena
-version: 0.95.5.4
+version: 0.95.5.5
 softdepend: [Spout,Towny,Heroes,MagicSpells,Vault]
 commands:
     ma:

src/com/garbagemule/MobArena/ArenaImpl.java

@@ -569,6 +569,7 @@ public class ArenaImpl implements Arena
             }
         }
 
+        movePlayerToLobby(p);
         takeFee(p);
         storePlayerData(p, loc);
         removePotionEffects(p);
@@ -580,7 +581,6 @@ public class ArenaImpl implements Arena
             p.setExp(0.0f);
         }
         p.setGameMode(GameMode.SURVIVAL);
-        movePlayerToLobby(p);
         
         arenaPlayerMap.put(p, new ArenaPlayer(p, this, plugin));
         
@@ -826,7 +826,7 @@ public class ArenaImpl implements Arena
         
         // If there's no player stored, create a new one!
         if (mp == null) {
-            mp = new PlayerData(p);
+            mp = new PlayerData(p, loc);
             playerData.put(p, mp);
         }
         

src/com/garbagemule/MobArena/PlayerData.java

@@ -18,11 +18,11 @@ public class PlayerData
     private Location entry = null;
     private Collection<PotionEffect> potions;
     
-    public PlayerData(Player player) {
+    public PlayerData(Player player, Location loc) {
         this.player  = player;
         this.mode    = player.getGameMode();
-        this.entry   = player.getLocation();
         this.potions = player.getActivePotionEffects();
+        this.entry   = loc;
         
         update();
     }