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

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-19 16:24:41 +00:00
parent 9d8a70d5cf 4fd3bee360
commit 6df983da3e
5 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,7 +314,7 @@ abstract class Projectile extends Entity{
$entityHit->attack($ev);
if($this->fireTicks > 0){
if($this->isOnFire()){
$ev = new EntityCombustByEntityEvent($this, $entityHit, 5);
$ev->call();
if(!$ev->isCancelled()){