diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 1dbc1c4914..b5c902708d 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -99,7 +99,6 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
         this.itemInWorldManager = new ItemInWorldManager((WorldServer) world);
         this.itemInWorldManager.player = this;
         this.itemInWorldManager.a(oldMode);
-        this.foodData = new FoodMetaData();
         // CraftBukkit end
     }
 
diff --git a/src/main/java/net/minecraft/server/ServerConfigurationManager.java b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
index 39353b1d3e..32c9fc5bee 100644
--- a/src/main/java/net/minecraft/server/ServerConfigurationManager.java
+++ b/src/main/java/net/minecraft/server/ServerConfigurationManager.java
@@ -251,6 +251,7 @@ public class ServerConfigurationManager {
             entityplayer.health = 20;
             entityplayer.fireTicks = 0;
             entityplayer.fallDistance = 0;
+            entityplayer.foodData = new FoodMetaData();
         } else {
             location.setWorld(this.server.getWorldServer(i).getWorld());
         }