6 files changed, 73 insertions, 6 deletions

diff --git a/src/Items/ItemFood.h b/src/Items/ItemFood.h
index 9035344df..1af6e21e8 100644
--- a/src/Items/ItemFood.h
+++ b/src/Items/ItemFood.h
@@ -1,3 +1,4 @@
+
 #pragma once
 
 #include "ItemHandler.h"
@@ -39,7 +40,6 @@ public:
 			// Golden apple handled in ItemGoldenApple
 			case E_ITEM_GOLDEN_CARROT:    return FoodInfo(6, 14.4);
 			case E_ITEM_MELON_SLICE:      return FoodInfo(2, 1.2);
-			case E_ITEM_MUSHROOM_SOUP:    return FoodInfo(6, 7.2);
 			case E_ITEM_POISONOUS_POTATO: return FoodInfo(2, 1.2);
 			// Potatoes handled in ItemSeeds
 			case E_ITEM_PUMPKIN_PIE:      return FoodInfo(8, 4.8);
diff --git a/src/Items/ItemGoldenApple.h b/src/Items/ItemGoldenApple.h
index 02ac0202c..5f6f1de6c 100644
--- a/src/Items/ItemGoldenApple.h
+++ b/src/Items/ItemGoldenApple.h
@@ -36,6 +36,7 @@ public:
 			a_Player->AddEntityEffect(cEntityEffect::effFireResistance, 6000, 0);
 		}
 
+		a_Player->GetInventory().RemoveOneEquippedItem();
 		return true;
 	}
 
diff --git a/src/Items/ItemHandler.cpp b/src/Items/ItemHandler.cpp
index 6ffcc718d..f7882a50f 100644
--- a/src/Items/ItemHandler.cpp
+++ b/src/Items/ItemHandler.cpp
@@ -33,6 +33,7 @@
 #include "ItemLilypad.h"
 #include "ItemMap.h"
 #include "ItemMinecart.h"
+#include "ItemMushroomSoup.h"
 #include "ItemNetherWart.h"
 #include "ItemPainting.h"
 #include "ItemPickaxe.h"
@@ -125,6 +126,7 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		case E_BLOCK_LILY_PAD:         return new cItemLilypadHandler(a_ItemType);
 		case E_ITEM_MAP:               return new cItemMapHandler();
 		case E_ITEM_MILK:              return new cItemMilkHandler();
+		case E_ITEM_MUSHROOM_SOUP:     return new cItemMushroomSoupHandler(a_ItemType);
 		case E_ITEM_ITEM_FRAME:        return new cItemItemFrameHandler(a_ItemType);
 		case E_ITEM_NETHER_WART:       return new cItemNetherWartHandler(a_ItemType);
 		case E_ITEM_PAINTING:          return new cItemPaintingHandler(a_ItemType);
@@ -216,7 +218,6 @@ cItemHandler *cItemHandler::CreateItemHandler(int a_ItemType)
 		case E_ITEM_COOKIE:
 		case E_ITEM_GOLDEN_CARROT:
 		case E_ITEM_MELON_SLICE:
-		case E_ITEM_MUSHROOM_SOUP:
 		case E_ITEM_MUTTON:
 		case E_ITEM_POISONOUS_POTATO:
 		case E_ITEM_PUMPKIN_PIE:
@@ -635,6 +636,10 @@ bool cItemHandler::GetEatEffect(cEntityEffect::eType & a_EffectType, int & a_Eff
 bool cItemHandler::EatItem(cPlayer * a_Player, cItem * a_Item)
 {
 	UNUSED(a_Item);
+	if (!a_Player->IsGameModeCreative())
+	{
+		a_Player->GetInventory().RemoveOneEquippedItem();
+	}
 
 	FoodInfo Info = GetFoodInfo();
 	if ((Info.FoodLevel > 0) || (Info.Saturation > 0.f))
diff --git a/src/Items/ItemMilk.h b/src/Items/ItemMilk.h
index db7bc13be..c9a90865a 100644
--- a/src/Items/ItemMilk.h
+++ b/src/Items/ItemMilk.h
@@ -21,8 +21,12 @@ public:
 	{
 		UNUSED(a_Item);
 		a_Player->ClearEntityEffects();
-		a_Player->GetInventory().RemoveOneEquippedItem();
-		a_Player->GetInventory().AddItem(E_ITEM_BUCKET);
+
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->GetInventory().RemoveOneEquippedItem();
+			a_Player->GetInventory().AddItem(E_ITEM_BUCKET);
+		}
 		return true;
 	}
 };
diff --git a/src/Items/ItemMushroomSoup.h b/src/Items/ItemMushroomSoup.h
new file mode 100644
index 000000000..dba313ec5
--- /dev/null
+++ b/src/Items/ItemMushroomSoup.h
@@ -0,0 +1,53 @@
+
+#pragma once
+
+#include "ItemHandler.h"
+
+
+
+
+
+class cItemMushroomSoupHandler :
+	public cItemHandler
+{
+	typedef cItemHandler super;
+	
+public:
+	cItemMushroomSoupHandler(int a_ItemType)
+		: super(a_ItemType)
+	{
+	}
+
+
+	virtual bool IsFood(void) override
+	{
+		return true;
+	}
+
+
+	virtual FoodInfo GetFoodInfo(void) override
+	{
+		return FoodInfo(6, 7.2);
+	}
+
+
+	virtual bool EatItem(cPlayer * a_Player, cItem * a_Item) override
+	{
+		if (!super::EatItem(a_Player, a_Item))
+		{
+			return false;
+		}
+
+		// Return a bowl to the inventory
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->GetInventory().AddItem(cItem(E_ITEM_BOWL), true, true);
+		}
+		return true;
+	}
+
+};
+
+
+
+
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h
index 24614cd8a..398ef6805 100644
--- a/src/Items/ItemPotion.h
+++ b/src/Items/ItemPotion.h
@@ -68,8 +68,12 @@ public:
 			cEntityEffect::GetPotionEffectDuration(PotionDamage),
 			cEntityEffect::GetPotionEffectIntensity(PotionDamage)
 		);
-		a_Player->GetInventory().RemoveOneEquippedItem();
-		a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE);
+
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->GetInventory().RemoveOneEquippedItem();
+			a_Player->GetInventory().AddItem(E_ITEM_GLASS_BOTTLE);
+		}
 		return true;
 	}
 };