From aba329544f215b1d4d7f0325de68e9bd5f93a666 Mon Sep 17 00:00:00 2001 From: Mat Date: Wed, 4 Mar 2020 16:12:15 +0200 Subject: Prevent container item duplication (#4476) --- src/BlockEntities/BlockEntityWithItems.cpp | 14 -------------- src/BlockEntities/BlockEntityWithItems.h | 1 - 2 files changed, 15 deletions(-) (limited to 'src/BlockEntities') diff --git a/src/BlockEntities/BlockEntityWithItems.cpp b/src/BlockEntities/BlockEntityWithItems.cpp index 1ec4f2068..fb21c0e51 100644 --- a/src/BlockEntities/BlockEntityWithItems.cpp +++ b/src/BlockEntities/BlockEntityWithItems.cpp @@ -26,20 +26,6 @@ cBlockEntityWithItems::cBlockEntityWithItems( -void cBlockEntityWithItems::Destroy(void) -{ - // Drop the contents as pickups: - ASSERT(m_World != nullptr); - cItems Pickups; - m_Contents.CopyToItems(Pickups); - m_Contents.Clear(); - m_World->SpawnItemPickups(Pickups, m_Pos.x + 0.5, m_Pos.y + 0.5, m_Pos.z + 0.5); // Spawn in centre of block -} - - - - - void cBlockEntityWithItems::CopyFrom(const cBlockEntity & a_Src) { super::CopyFrom(a_Src); diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index 4782269dc..ffce3c4f7 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -44,7 +44,6 @@ public: // tolua_export ); // cBlockEntity overrides: - virtual void Destroy(void) override; virtual void CopyFrom(const cBlockEntity & a_Src) override; // tolua_begin -- cgit v1.2.3