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

Painting: clean up guard checks, remove unnecessary checks

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-29 19:29:10 +00:00
parent 93c26a0b0c
commit 60dddcd12a
1 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/item/PaintingItem.php
View File

@ -37,8 +37,10 @@ class PaintingItem extends Item{
} }
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{ public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
if(!$blockClicked->isTransparent() and $face > 1 and !$blockReplace->isSolid()){ if($face === Vector3::SIDE_DOWN or $face === Vector3::SIDE_UP){
/** @var PaintingMotive[] $motives */ return false;
}
$motives = []; $motives = [];
$totalDimension = 0; $totalDimension = 0;
@ -98,7 +100,6 @@ class PaintingItem extends Item{
$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound $player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
return true; return true;
} }
}
return false; return false;
} }