diff --git a/MobArena.jar b/MobArena.jar
index 4175649..3f12aff 100644
Binary files a/MobArena.jar and b/MobArena.jar differ
diff --git a/resources/plugin.yml b/resources/plugin.yml
index 7718221..d78fc87 100644
--- a/resources/plugin.yml
+++ b/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: MobArena
 main: com.garbagemule.MobArena.MobArena
-version: 0.94.3.2
+version: 0.94.3.3
 softdepend: [Spout,Permissions,MultiVerse,XcraftGate,Towny,Heroes,MagicSpells]
 commands:
     ma:
diff --git a/src/com/garbagemule/MobArena/Arena.java b/src/com/garbagemule/MobArena/Arena.java
index f2e525e..c306ab2 100644
--- a/src/com/garbagemule/MobArena/Arena.java
+++ b/src/com/garbagemule/MobArena/Arena.java
@@ -22,6 +22,7 @@ import net.minecraft.server.WorldServer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Chunk;
+import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -107,6 +108,7 @@ public class Arena
     protected Map<Player,Location> locations = new HashMap<Player,Location>();
     protected Map<Player,Integer> healthMap = new HashMap<Player,Integer>();
     protected Map<Player,Integer> hungerMap = new HashMap<Player,Integer>();
+    protected Map<Player,GameMode> modeMap = new HashMap<Player,GameMode>();
     
     // Logging
     protected ArenaLog log;
@@ -562,6 +564,9 @@ public class Arena
         
         if (!hungerMap.containsKey(p))
             hungerMap.put(p, p.getFoodLevel());
+        
+        if (!modeMap.containsKey(p))
+            modeMap.put(p, p.getGameMode());
     }
     
     public void storeContainerContents()
@@ -632,6 +637,9 @@ public class Arena
         
         if (hungerMap.containsKey(p))
             p.setFoodLevel(hungerMap.remove(p));
+        
+        if (modeMap.containsKey(p))
+            p.setGameMode(modeMap.remove(p));
 
         // Put out fire.
         p.setFireTicks(0);