Fixed pickup spawning with inherited gamemode.
This commit is contained in:
parent
7f112a1ebb
commit
405d434c06
@ -735,6 +735,7 @@ void cClientHandle::HandleBlockDigFinished(int a_BlockX, int a_BlockY, int a_Blo
|
|||||||
|
|
||||||
cWorld * World = m_Player->GetWorld();
|
cWorld * World = m_Player->GetWorld();
|
||||||
ItemHandler->OnBlockDestroyed(World, m_Player, m_Player->GetEquippedItem(), a_BlockX, a_BlockY, a_BlockZ);
|
ItemHandler->OnBlockDestroyed(World, m_Player, m_Player->GetEquippedItem(), a_BlockX, a_BlockY, a_BlockZ);
|
||||||
|
// The ItemHandler is also responsible for spawning the pickups
|
||||||
|
|
||||||
BlockHandler(a_OldBlock)->OnDestroyedByPlayer(World, m_Player, a_BlockX, a_BlockY, a_BlockZ);
|
BlockHandler(a_OldBlock)->OnDestroyedByPlayer(World, m_Player, a_BlockX, a_BlockY, a_BlockZ);
|
||||||
World->BroadcastSoundParticleEffect(2001, a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, a_OldBlock, this);
|
World->BroadcastSoundParticleEffect(2001, a_BlockX * 8, a_BlockY * 8, a_BlockZ * 8, a_OldBlock, this);
|
||||||
|
@ -247,7 +247,7 @@ void cItemHandler::OnBlockDestroyed(cWorld * a_World, cPlayer * a_Player, const
|
|||||||
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
BLOCKTYPE Block = a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ);
|
||||||
cBlockHandler * Handler = cBlockHandler::GetBlockHandler(Block);
|
cBlockHandler * Handler = cBlockHandler::GetBlockHandler(Block);
|
||||||
|
|
||||||
if (a_Player->GetGameMode() == gmSurvival)
|
if (a_Player->IsGameModeSurvival())
|
||||||
{
|
{
|
||||||
if (!BlockRequiresSpecialTool(Block) || CanHarvestBlock(Block))
|
if (!BlockRequiresSpecialTool(Block) || CanHarvestBlock(Block))
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user