From b63741dc22542081c5730458b921f102f7e6d78e Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sat, 27 Apr 2024 03:36:46 +0300 Subject: [PATCH] fixed items getting damaged when hitting players in gm 1 --- src/Player.php | 3 ++- src/entity/Entity.php | 6 +++--- src/entity/ai/tasks/TaskAttackPlayer.php | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Player.php b/src/Player.php index 5b08d890..56f54447 100755 --- a/src/Player.php +++ b/src/Player.php @@ -1230,6 +1230,7 @@ class Player{ $motionSent = false; $moveSent = false; $headSent = false; + if($e->speedX != 0 || $e->speedY != 0 || $e->speedZ != 0 || $e->speedY != $e->lastSpeedY || $e->speedX != $e->lastSpeedX || $e->speedZ != $e->lastSpeedZ){ if(!($e->speedY < 0 && $e->onGround) || $e->speedX != 0 || $e->speedZ != 0 || $e->speedY != $e->lastSpeedY || $e->speedX != $e->lastSpeedX || $e->speedZ != $e->lastSpeedZ){ $motion = new SetEntityMotionPacket(); @@ -2653,7 +2654,7 @@ class Player{ } public function damageArmorPart($slot, $part){ - $part->useOn($this->entity, true); //PocketMine is forced to do it =<. Even if PocketMine doesnt want, he have to damage your armor. + $part->useOn($this->entity, true); if($part->getMetadata() >= $part->getMaxDurability()){ $this->setArmor($slot, BlockAPI::getItem(AIR, 0, 0), false); return; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 44dc2311..617f730e 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -945,10 +945,10 @@ class Entity extends Position if($action === InteractPacket::ACTION_ATTACK && $e->isPlayer()){ $slot = $e->player->getHeldItem(); - $damage = $slot->getDamageAgainstOf($e); + $damage = $slot->getDamageAgainstOf($this); $this->harm($damage, $e->eid); - if($slot->isTool() === true and ($e->player->gamemode & 0x01) === 0){ - if($slot->useOn($e) and $slot->getMetadata() >= $slot->getMaxDurability()){ + if($slot->isTool() and ($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/TaskAttackPlayer.php b/src/entity/ai/tasks/TaskAttackPlayer.php index 4b757431..57105c95 100644 --- a/src/entity/ai/tasks/TaskAttackPlayer.php +++ b/src/entity/ai/tasks/TaskAttackPlayer.php @@ -70,7 +70,7 @@ class TaskAttackPlayer 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 ?