flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed mobs attacking Creative Mode players

This commit is contained in:
Safwat Halaby 2015-12-13 07:51:13 +02:00
parent 86b51083a1
commit 91aec448eb
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mobs/AggressiveMonster.cpp
View File

@ -28,14 +28,6 @@ void cAggressiveMonster::InStateChasing(std::chrono::milliseconds a_Dt)
if (m_Target != nullptr)
{
if (m_Target->IsPlayer())
{
if (static_cast<cPlayer *>(m_Target)->IsGameModeCreative())
{
m_EMState = IDLE;
return;
}
}
MoveToPosition(m_Target->GetPosition());
}
}
@ -103,6 +95,6 @@ bool cAggressiveMonster::Attack(std::chrono::milliseconds a_Dt)
// Setting this higher gives us more wiggle room for attackrate
m_AttackInterval = 0.0;
m_Target->TakeDamage(dtMobAttack, this, m_AttackDamage, 0);
return true;
}

16
src/Mobs/Monster.cpp
View File

@ -231,9 +231,21 @@ void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
++m_TicksSinceLastDamaged;
}
if ((m_Target != nullptr) && m_Target->IsDestroyed())
if ((m_Target != nullptr))
{
m_Target = nullptr;
if (m_Target->IsDestroyed())
{
m_Target = nullptr;
}
else if (m_Target->IsPlayer())
{
if (static_cast<cPlayer *>(m_Target)->IsGameModeCreative())
{
m_Target = nullptr;
m_EMState = IDLE;
return;
}
}
}
// Process the undead burning in daylight.