From 6bdd130aab51b630918ed664c4389cf33bcb2e06 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Wed, 29 Jul 2020 19:30:38 +0100 Subject: OnBroken/OnPlaced are for entity actions * Call OnPlaced/OnBroken in PlaceBlock/DigBlock - Remove unused Placing/Breaking handlers * Have the blockhandler's Check handle neighbour updating, instead of QueueTickBlockNeighbors --- src/Items/ItemChest.h | 2 -- src/Items/ItemLighter.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/Items') diff --git a/src/Items/ItemChest.h b/src/Items/ItemChest.h index 014ccc3e6..ecd957a59 100644 --- a/src/Items/ItemChest.h +++ b/src/Items/ItemChest.h @@ -54,7 +54,6 @@ public: Vector3i PlacePos; if (blockHandler->DoesIgnoreBuildCollision(ChunkInterface, a_ClickedBlockPos, a_Player, ClickedBlockMeta)) { - blockHandler->OnPlayerBreakingBlock(ChunkInterface, a_World, a_Player, a_ClickedBlockPos); PlacePos = a_ClickedBlockPos; } else @@ -75,7 +74,6 @@ public: { return false; } - blockHandler->OnPlayerBreakingBlock(ChunkInterface, a_World, a_Player, PlacePos); } // Check that there is at most one single neighbor of the same chest type: diff --git a/src/Items/ItemLighter.h b/src/Items/ItemLighter.h index d4469a31b..a7e192ee6 100644 --- a/src/Items/ItemLighter.h +++ b/src/Items/ItemLighter.h @@ -65,7 +65,7 @@ public: case E_BLOCK_TNT: { // Activate the TNT: - a_World->SetBlock(a_ClickedBlockPos, E_BLOCK_AIR, 0); + a_World->DigBlock(a_ClickedBlockPos); a_World->SpawnPrimedTNT(Vector3d(a_ClickedBlockPos) + Vector3d(0.5, 0.5, 0.5)); // 80 ticks to boom break; } @@ -79,7 +79,7 @@ public: } if (a_World->GetBlock(FirePos) == E_BLOCK_AIR) { - a_World->SetBlock(FirePos, E_BLOCK_FIRE, 0); + a_World->PlaceBlock(FirePos, E_BLOCK_FIRE, 0); a_World->BroadcastSoundEffect("item.flintandsteel.use", FirePos, 1.0f, 1.04f); break; } -- cgit v1.2.3