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

Merge branch 'patch-11' of https://github.com/Creeperface01/PocketMine-MP into Creeperface01-patch-11

Browse Source
This commit is contained in:
Intyre 2015-12-20 00:28:50 +01:00
commit e4ab7a08ec
No known key found for this signature in database
GPG Key ID: B06D41D26935005A
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pocketmine/block/Cake.php
View File

@ -96,13 +96,15 @@ class Cake extends Transparent{
$ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING); $ev = new EntityRegainHealthEvent($player, 3, EntityRegainHealthEvent::CAUSE_EATING);
$player->heal($ev->getAmount(), $ev); $player->heal($ev->getAmount(), $ev);
if($this->meta >= 0x06){ if(!$ev->isCancelled()){
$this->getLevel()->setBlock($this, new Air(), true); if($this->meta >= 0x06){
}else{ $this->getLevel()->setBlock($this, new Air(), true);
$this->getLevel()->setBlock($this, $this, true); }else{
} $this->getLevel()->setBlock($this, $this, true);
}
return true; return true;
}
} }
return false; return false;