mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-04-23 07:27:20 +00:00
Fixed Enderman, monster aggro in creative (#1051)
Fixed endermans by making a invulnerable check
This commit is contained in:
parent
5f777a7f45
commit
c90a6bf5ab
|
|
@ -410,9 +410,14 @@ bool EnderMan::hurt(DamageSource *source, float damage)
|
|||
|
||||
if ( dynamic_cast<EntityDamageSource *>(source) != nullptr && source->getEntity()->instanceof(eTYPE_PLAYER))
|
||||
{
|
||||
aggroedByPlayer = true;
|
||||
if (!dynamic_pointer_cast<Player>(source->getEntity())->abilities.invulnerable)
|
||||
{
|
||||
aggroedByPlayer = true;
|
||||
}
|
||||
else setCreepy(false);
|
||||
}
|
||||
|
||||
|
||||
if (dynamic_cast<IndirectEntityDamageSource *>(source) != nullptr)
|
||||
{
|
||||
aggroedByPlayer = false;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,14 @@ bool Monster::hurt(DamageSource *source, float dmg)
|
|||
|
||||
if (sourceEntity != shared_from_this())
|
||||
{
|
||||
attackTarget = sourceEntity;
|
||||
if (sourceEntity->instanceof(eTYPE_PLAYER))
|
||||
{
|
||||
if (!dynamic_pointer_cast<Player>(sourceEntity)->abilities.invulnerable)
|
||||
{
|
||||
attackTarget = sourceEntity;
|
||||
}
|
||||
}
|
||||
else attackTarget = sourceEntity;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue