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

Improved Item property handling

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-12-07 15:51:00 +01:00
parent a98da3bab1
commit 7506f01302
17 changed files with 103 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/level/Level.php
View File

@ -1266,11 +1266,11 @@ class Level implements ChunkManager, Metadatable{
$this->server->getPluginManager()->callEvent($ev);
if(!$ev->isCancelled()){
$target->onUpdate(self::BLOCK_UPDATE_TOUCH);
if($target->isActivable === true and $target->onActivate($item, $player) === true){
if($target->canBeActivated() === true and $target->onActivate($item, $player) === true){
return true;
}
if($item->isActivable and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){
if($item->canBeActivated() and $item->onActivate($this, $player, $block, $target, $face, $fx, $fy, $fz)){
if($item->getCount() <= 0){
$item = Item::get(Item::AIR, 0, 0);
@ -1278,7 +1278,7 @@ class Level implements ChunkManager, Metadatable{
}
}
}
}elseif($target->isActivable === true and $target->onActivate($item, $player) === true){
}elseif($target->canBeActivated() === true and $target->onActivate($item, $player) === true){
return true;
}