From edf9e39ed76001b2bb95d1fb74cc88fa60a42e83 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 15 Mar 2021 17:06:40 +0000 Subject: Mob heads, banners cannot be used * Fixed UsedBy returning true, blocking block placement --- src/BlockEntities/MobHeadEntity.cpp | 66 +++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 35 deletions(-) (limited to 'src/BlockEntities/MobHeadEntity.cpp') diff --git a/src/BlockEntities/MobHeadEntity.cpp b/src/BlockEntities/MobHeadEntity.cpp index eee6cf9c1..14773a0f1 100644 --- a/src/BlockEntities/MobHeadEntity.cpp +++ b/src/BlockEntities/MobHeadEntity.cpp @@ -25,41 +25,6 @@ cMobHeadEntity::cMobHeadEntity(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, Ve -cItems cMobHeadEntity::ConvertToPickups() const -{ - return cItem(E_ITEM_HEAD, 1, static_cast(m_Type)); -} - - - - - -void cMobHeadEntity::CopyFrom(const cBlockEntity & a_Src) -{ - Super::CopyFrom(a_Src); - auto & src = static_cast(a_Src); - m_OwnerName = src.m_OwnerName; - m_OwnerTexture = src.m_OwnerTexture; - m_OwnerTextureSignature = src.m_OwnerTextureSignature; - m_OwnerUUID = src.m_OwnerUUID; - m_Rotation = src.m_Rotation; - m_Type = src.m_Type; -} - - - - - -bool cMobHeadEntity::UsedBy(cPlayer * a_Player) -{ - UNUSED(a_Player); - return true; -} - - - - - void cMobHeadEntity::SetType(const eMobHeadType & a_Type) { if ((!m_OwnerName.empty()) && (a_Type != SKULL_TYPE_PLAYER)) @@ -131,6 +96,31 @@ void cMobHeadEntity::SetOwner(const cUUID & a_OwnerUUID, const AString & a_Owner +cItems cMobHeadEntity::ConvertToPickups() const +{ + return cItem(E_ITEM_HEAD, 1, static_cast(m_Type)); +} + + + + + +void cMobHeadEntity::CopyFrom(const cBlockEntity & a_Src) +{ + Super::CopyFrom(a_Src); + auto & src = static_cast(a_Src); + m_OwnerName = src.m_OwnerName; + m_OwnerTexture = src.m_OwnerTexture; + m_OwnerTextureSignature = src.m_OwnerTextureSignature; + m_OwnerUUID = src.m_OwnerUUID; + m_Rotation = src.m_Rotation; + m_Type = src.m_Type; +} + + + + + void cMobHeadEntity::SendTo(cClientHandle & a_Client) { cWorld * World = a_Client.GetPlayer()->GetWorld(); @@ -141,3 +131,9 @@ void cMobHeadEntity::SendTo(cClientHandle & a_Client) + +bool cMobHeadEntity::UsedBy(cPlayer * a_Player) +{ + UNUSED(a_Player); + return false; +} -- cgit v1.2.3