mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-10 21:45:35 +00:00
Code Issues Projects Releases Wiki Activity

Fixed arrow damage not getting overridden by the event result

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-10-08 15:38:58 +02:00
parent 08aa7808cf
commit dd140ce018
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Server.php
View File

@ -1540,7 +1540,7 @@ class Server{
$this->addInterface($this->mainInterface = new RakLibInterface($this)); $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); $this->logger->info($this->getName() . " is distributed under the LGPL License", true, true, 0);
PluginManager::$pluginParentTimer = new TimingsHandler("** Plugins"); PluginManager::$pluginParentTimer = new TimingsHandler("** Plugins");

2
src/pocketmine/entity/Arrow.php
View File

@ -125,7 +125,7 @@ class Arrow extends Projectile{
$this->server->getPluginManager()->callEvent($ev); $this->server->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$movingObjectPosition->entityHit->attack($damage, $ev); $movingObjectPosition->entityHit->attack($ev->getFinalDamage(), $ev);
if($this->fireTicks > 0){ if($this->fireTicks > 0){
$movingObjectPosition->entityHit->setOnFire(5); $movingObjectPosition->entityHit->setOnFire(5);
} }