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

Removed unnecessary methods Block->canBeActivated() and Item->canBeActivated() (needless extra confusion)

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-02-22 11:48:58 +00:00
parent 036663e0b5
commit 6ae24c5c19
25 changed files with 3 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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