From 90c398a3926f097e51955817e2829d831ae2bd2b Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 19 May 2013 18:22:37 +0000 Subject: Inventory code cleanup, players can now see each other's armor git-svn-id: http://mc-server.googlecode.com/svn/trunk@1493 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Items/ItemSpawnEgg.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source/Items/ItemSpawnEgg.h') diff --git a/source/Items/ItemSpawnEgg.h b/source/Items/ItemSpawnEgg.h index 1557fb59c..c6fa363bb 100644 --- a/source/Items/ItemSpawnEgg.h +++ b/source/Items/ItemSpawnEgg.h @@ -19,7 +19,7 @@ public: } - virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, cItem * a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace) override + virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace) override { if (a_BlockFace < 0) { @@ -33,12 +33,13 @@ public: a_BlockY--; } - if (a_World->SpawnMob(a_BlockX + 0.5, a_BlockY, a_BlockZ + 0.5, a_Item->m_ItemDamage) >= 0) + if (a_World->SpawnMob(a_BlockX + 0.5, a_BlockY, a_BlockZ + 0.5, a_Item.m_ItemDamage) >= 0) { if (a_Player->GetGameMode() != 1) { // The mob was spawned, "use" the item: - a_Player->GetInventory().RemoveItem(a_Player->GetInventory().GetEquippedItem()); + cItem Equipped(a_Player->GetEquippedItem()); + a_Player->GetInventory().RemoveItem(Equipped); } return true; } -- cgit v1.2.3