mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.3'

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-10-05 18:11:33 +01:00
parent 47f43c5e6b 620784e4e7
commit 495a0b1dc2
28 changed files with 182 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,7 @@ class Arrow extends Projectile{
$ev->setCancelled();
}
$this->server->getPluginManager()->callEvent($ev);
$ev->call();
if($ev->isCancelled()){
return;
}

4
src/pocketmine/entity/projectile/Projectile.php
View File

@ -243,7 +243,7 @@ abstract class Projectile extends Entity{
}
if($ev !== null){
$this->server->getPluginManager()->callEvent($ev);
$ev->call();
$this->onHit($ev);
if($ev instanceof ProjectileHitEntityEvent){
@ -317,7 +317,7 @@ abstract class Projectile extends Entity{
if($this->fireTicks > 0){
$ev = new EntityCombustByEntityEvent($this, $entityHit, 5);
$this->server->getPluginManager()->callEvent($ev);
$ev->call();
if(!$ev->isCancelled()){
$entityHit->setOnFire($ev->getDuration());
}