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

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-08-22 14:13:31 +01:00
parent 4250e99e3a 50580f4408
commit 445a67954d
131 changed files with 690 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/entity/PrimedTNT.php
View File

@ -48,9 +48,9 @@ class PrimedTNT extends Entity implements Explosive{
public $canCollide = false;
public function attack($damage, EntityDamageEvent $source){
public function attack(EntityDamageEvent $source){
if($source->getCause() === EntityDamageEvent::CAUSE_VOID){
parent::attack($damage, $source);
parent::attack($source);
}
}