From f43293a376441a50aedc7c1ebca96c1cc2fd7c02 Mon Sep 17 00:00:00 2001
From: garbagemule <garbagemule@gmail.com>
Date: Tue, 30 Jul 2013 23:37:03 +0200
Subject: [PATCH] Attempt to fix multiworld inventory issues.

---
 resources/plugin.yml                         | 2 +-
 src/com/garbagemule/MobArena/ArenaImpl.java  | 4 ++--
 src/com/garbagemule/MobArena/PlayerData.java | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/plugin.yml b/resources/plugin.yml
index 802a689..8bc8813 100644
--- a/resources/plugin.yml
+++ b/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:
diff --git a/src/com/garbagemule/MobArena/ArenaImpl.java b/src/com/garbagemule/MobArena/ArenaImpl.java
index b373a53..d2ee08a 100644
--- a/src/com/garbagemule/MobArena/ArenaImpl.java
+++ b/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);
         }
         
diff --git a/src/com/garbagemule/MobArena/PlayerData.java b/src/com/garbagemule/MobArena/PlayerData.java
index ec2d58d..71b119c 100644
--- a/src/com/garbagemule/MobArena/PlayerData.java
+++ b/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();
     }