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/JukeboxEntity.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/JukeboxEntity.cpp') diff --git a/source/JukeboxEntity.cpp b/source/JukeboxEntity.cpp index 3b4c8e1d9..00f4bd533 100644 --- a/source/JukeboxEntity.cpp +++ b/source/JukeboxEntity.cpp @@ -32,7 +32,7 @@ cJukeboxEntity::~cJukeboxEntity() -void cJukeboxEntity::UsedBy( cPlayer * a_Player ) +void cJukeboxEntity::UsedBy(cPlayer * a_Player) { if (m_Record == 0) { @@ -40,7 +40,8 @@ void cJukeboxEntity::UsedBy( cPlayer * a_Player ) if (HeldItem.m_ItemType >= 2256 && HeldItem.m_ItemType <= 2267) { m_Record = HeldItem.m_ItemType; - a_Player->GetInventory().RemoveItem(a_Player->GetInventory().GetEquippedItem()); + cItem Equipped(a_Player->GetInventory().GetEquippedItem()); + a_Player->GetInventory().RemoveItem(Equipped); PlayRecord(); } } -- cgit v1.2.3