1 files changed, 5 insertions, 2 deletions

diff --git a/src/Items/ItemBottle.h b/src/Items/ItemBottle.h
index b261937e5..18767dcde 100644
--- a/src/Items/ItemBottle.h
+++ b/src/Items/ItemBottle.h
@@ -83,8 +83,11 @@ public:
 			return false;  // Nothing in range.
 		}
 
-		a_Player->GetInventory().RemoveOneEquippedItem();
-		a_Player->GetInventory().AddItem(cItem(E_ITEM_POTION));
+		// Give back a filled water bottle if gamemode is not creative:
+		if (!a_Player->IsGameModeCreative())
+		{
+			a_Player->ReplaceOneEquippedItemTossRest(cItem(E_ITEM_POTION));
+		}
 		return true;
 	}
 } ;