Don't attack entities that are closed. (Hacky solution Fixes #379 Fixes

#376 Fixes #368 Fixes #321)
RevivalPMMP · May 3, 2020 · 0b14a9e · 0b14a9e
1 parent 94debce
commit 0b14a9e
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/revivalpmmp/pureentities/entity/monster/FlyingMonster.php b/src/revivalpmmp/pureentities/entity/monster/FlyingMonster.php
@@ -127,7 +127,7 @@ public function onUpdate(int $currentTick) : bool{
 		$this->entityBaseTick($tickDiff);
 
 		$target = $this->updateMove($tickDiff);
-		if($target instanceof Player){
+		if($target instanceof Player && !$target->isClosed()){
 			$this->attackEntity($target);
 		}elseif(
 			$target instanceof Vector3

diff --git a/src/revivalpmmp/pureentities/entity/monster/JumpingMonster.php b/src/revivalpmmp/pureentities/entity/monster/JumpingMonster.php
@@ -130,7 +130,9 @@ public function onUpdate(int $currentTick) : bool{
 		if($this->isFriendly()){
 			if(!($target instanceof Player)){
 				if($target instanceof Entity){
-					$this->attackEntity($target);
+					if(!$target->isClosed()){
+						$this->attackEntity($target);
+					}
 				}elseif(
 					$target instanceof Vector3
 					&& (($this->x - $target->x) ** 2 + ($this->z - $target->z) ** 2) <= 1
@@ -140,7 +142,9 @@ public function onUpdate(int $currentTick) : bool{
 			}
 		}else{
 			if($target instanceof Entity){
-				$this->attackEntity($target);
+				if(!$target->isClosed()){
+					$this->attackEntity($target);
+				}
 			}elseif(
 				$target instanceof Vector3
 				&& (($this->x - $target->x) ** 2 + ($this->z - $target->z) ** 2) <= 1

diff --git a/src/revivalpmmp/pureentities/entity/monster/SwimmingMonster.php b/src/revivalpmmp/pureentities/entity/monster/SwimmingMonster.php
@@ -130,7 +130,9 @@ public function onUpdate(int $currentTick) : bool{
 		if($this->isFriendly()){
 			if(!($target instanceof Player)){
 				if($target instanceof Entity){
-					$this->attackEntity($target);
+					if(!$target->isClosed()){
+						$this->attackEntity($target);
+					}
 				}elseif(
 					$target instanceof Vector3
 					&& (($this->x - $target->x) ** 2 + ($this->z - $target->z) ** 2) <= 1
@@ -140,7 +142,9 @@ public function onUpdate(int $currentTick) : bool{
 			}
 		}else{
 			if($target instanceof Entity){
-				$this->attackEntity($target);
+				if(!$target->isClosed()){
+					$this->attackEntity($target);
+				}
 			}elseif(
 				$target instanceof Vector3
 				&& (($this->x - $target->x) ** 2 + ($this->z - $target->z) ** 2) <= 1

diff --git a/src/revivalpmmp/pureentities/entity/monster/WalkingMonster.php b/src/revivalpmmp/pureentities/entity/monster/WalkingMonster.php
@@ -63,6 +63,9 @@ public abstract function attackEntity(Entity $player);
 	 * @param Entity $player
 	 */
 	public function checkAndAttackEntity(Entity $player){
+		if($player->isClosed()){
+			return;
+		}
 		if($this instanceof IntfTameable and $this->isTamed()){
 			if($player instanceof Player and strcasecmp($player->getName(), $this->getOwner()->getName()) === 0){
 				// a tamed entity doesn't attack it's owner!

diff --git a/src/revivalpmmp/pureentities/utils/MobDamageCalculator.php b/src/revivalpmmp/pureentities/utils/MobDamageCalculator.php
@@ -80,7 +80,7 @@ class MobDamageCalculator{
 	 * @return float the final damage calculated with respect to armor etc. pp worn by player
 	 */
 	public static function calculateFinalDamage(Entity $player, float $damageFromEntity) : float{
-		if($player instanceof Player and $player->getArmorInventory() !== null){
+		if($player instanceof Player and !$player->isClosed()){
 			$playerArmor = $player->getArmorInventory();
 			$armorItems = [$playerArmor->getHelmet(), $playerArmor->getChestplate(), $playerArmor->getLeggings(), $playerArmor->getBoots()];