Merge pull request #1 from KnosTx/KnosTx-patch-1

Mace Implementation.                     JavierLeon9966

src/item/Mace.php

@@ -27,7 +27,6 @@
 use pocketmine\block\BlockToolType;
 use pocketmine\entity\Entity;
 use pocketmine\entity\Living;
-use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\particle\HugeExplodeParticle;
 use pocketmine\world\sound\MaceSmashAirSound;
@@ -85,21 +84,26 @@ public function onAttackEntity(Entity $victim, array &$returnedItems) : bool{
 			$fallDistance = $holder->getFallDistance();
 
 			if($fallDistance >= self::SMASH_ATTACK_FALL_HEIGHT){
-
-				$damage = self::SMASH_ATTACK_DAMAGE + (int)($fallDistance * 2);
+				$damage = self::SMASH_ATTACK_DAMAGE + (int) ( $fallDistance * 2);
 				$world->addSound($position, new MaceSmashGroundSound());
 				$world->addParticle($position, new HugeExplodeParticle());
 				$holder->resetFallDistance();
 
 				foreach($victim->getWorld()->getNearbyEntities($victim->getBoundingBox()->expandedCopy(3, 3, 3)) as $nearbyEntity){
 					if($nearbyEntity instanceof Living && $nearbyEntity !== $holder){
-						$knockbackVector = $nearbyEntity->getPosition()->subtract($holder->getPosition())->normalize()->multiply(0.4);
+						$knockbackVector = $nearbyEntity->getPosition()->subtract(
+							$holder->getPosition()->getX(),
+							$holder->getPosition()->getY(),
+							$holder->getPosition()->getZ()
+						)->normalize()->multiply(0.4);
 						$nearbyEntity->knockBack($knockbackVector->x, $knockbackVector->z, 0.4);
 					}
 				}
 				return $this->applyDamage(1);
 			}
 		}
+
+		$victim->setHealth($victim->getHealth() - self::NORMAL_ATTACK_DAMAGE);
 		return $this->applyDamage(1);
 	}
 }