From a52e38de5df910a24e8419efb75b112f88bab0c5 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 27 Apr 2024 16:14:19 +0300 Subject: [PATCH] fixed spam in console --- src/entity/Entity.php | 2 +- src/entity/ai/tasks/TaskRangedAttack.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 617f730e..e081502c 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -947,7 +947,7 @@ class Entity extends Position $slot = $e->player->getHeldItem(); $damage = $slot->getDamageAgainstOf($this); $this->harm($damage, $e->eid); - if($slot->isTool() and ($this->player->gamemode & 0x01) === 0){ + if($slot->isTool() && (!$this->isPlayer() || ($this->player->gamemode & 0x01) === 0)){ if($slot->useOn($this) and $slot->getMetadata() >= $slot->getMaxDurability()){ $e->player->removeItem($slot->getID(), $slot->getMetadata(), 1, true); } diff --git a/src/entity/ai/tasks/TaskRangedAttack.php b/src/entity/ai/tasks/TaskRangedAttack.php index c0e93386..e834b96a 100644 --- a/src/entity/ai/tasks/TaskRangedAttack.php +++ b/src/entity/ai/tasks/TaskRangedAttack.php @@ -114,7 +114,7 @@ class TaskRangedAttack extends \TaskBase } } - $closestTarget = $e->closestPlayerDist <= $this->rangeSquared ? $e->level->entityList[$e->closestPlayerEID] : null; + $closestTarget = $e->closestPlayerDist <= $this->rangeSquared ? ($e->level->entityList[$e->closestPlayerEID] ?? null) : null; if($closestTarget != null){ $e->target = $closestTarget; //TODO dont save entity object ?