From dd140ce01815216fc04e2894a061bfb7c4075e32 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Wed, 8 Oct 2014 15:38:58 +0200 Subject: [PATCH] Fixed arrow damage not getting overridden by the event result --- src/pocketmine/Server.php | 2 +- src/pocketmine/entity/Arrow.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index a0cf75770f..2efec897c9 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -1540,7 +1540,7 @@ class Server{ $this->addInterface($this->mainInterface = new RakLibInterface($this)); - $this->logger->info("This server is running " . $this->getName() . " version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(false) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0); + $this->logger->info("This server is running " . $this->getName() . " version " . ($version->isDev() ? TextFormat::YELLOW : "") . $version->get(true) . TextFormat::RESET . " \"" . $this->getCodename() . "\" (API " . $this->getApiVersion() . ")", true, true, 0); $this->logger->info($this->getName() . " is distributed under the LGPL License", true, true, 0); PluginManager::$pluginParentTimer = new TimingsHandler("** Plugins"); diff --git a/src/pocketmine/entity/Arrow.php b/src/pocketmine/entity/Arrow.php index b8cf0c6ed1..bacd8ed55f 100644 --- a/src/pocketmine/entity/Arrow.php +++ b/src/pocketmine/entity/Arrow.php @@ -125,7 +125,7 @@ class Arrow extends Projectile{ $this->server->getPluginManager()->callEvent($ev); if(!$ev->isCancelled()){ - $movingObjectPosition->entityHit->attack($damage, $ev); + $movingObjectPosition->entityHit->attack($ev->getFinalDamage(), $ev); if($this->fireTicks > 0){ $movingObjectPosition->entityHit->setOnFire(5); }