mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-07 12:18:46 +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

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

@ -37,67 +37,68 @@ 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 = []; }
$totalDimension = 0; $motives = [];
foreach(PaintingMotive::getAll() as $motive){
$currentTotalDimension = $motive->getHeight() + $motive->getWidth(); $totalDimension = 0;
if($currentTotalDimension < $totalDimension){ foreach(PaintingMotive::getAll() as $motive){
continue; $currentTotalDimension = $motive->getHeight() + $motive->getWidth();
if($currentTotalDimension < $totalDimension){
continue;
}
if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){
if($currentTotalDimension > $totalDimension){
$totalDimension = $currentTotalDimension;
/*
* This drops all motive possibilities smaller than this
* We use the total of height + width to allow equal chance of horizontal/vertical paintings
* when there is an L-shape of space available.
*/
$motives = [];
} }
if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){ $motives[] = $motive;
if($currentTotalDimension > $totalDimension){
$totalDimension = $currentTotalDimension;
/*
* This drops all motive possibilities smaller than this
* We use the total of height + width to allow equal chance of horizontal/vertical paintings
* when there is an L-shape of space available.
*/
$motives = [];
}
$motives[] = $motive;
}
} }
}
if(empty($motives)){ //No space available if(empty($motives)){ //No space available
return false; return false;
} }
/** @var PaintingMotive $motive */ /** @var PaintingMotive $motive */
$motive = $motives[array_rand($motives)]; $motive = $motives[array_rand($motives)];
static $directions = [ static $directions = [
Vector3::SIDE_SOUTH => 0, Vector3::SIDE_SOUTH => 0,
Vector3::SIDE_WEST => 1, Vector3::SIDE_WEST => 1,
Vector3::SIDE_NORTH => 2, Vector3::SIDE_NORTH => 2,
Vector3::SIDE_EAST => 3 Vector3::SIDE_EAST => 3
]; ];
$direction = $directions[$face] ?? -1; $direction = $directions[$face] ?? -1;
if($direction === -1){ if($direction === -1){
return false; return false;
} }
$nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0); $nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0);
$nbt->setByte("Direction", $direction); $nbt->setByte("Direction", $direction);
$nbt->setString("Motive", $motive->getName()); $nbt->setString("Motive", $motive->getName());
$nbt->setInt("TileX", $blockClicked->getFloorX()); $nbt->setInt("TileX", $blockClicked->getFloorX());
$nbt->setInt("TileY", $blockClicked->getFloorY()); $nbt->setInt("TileY", $blockClicked->getFloorY());
$nbt->setInt("TileZ", $blockClicked->getFloorZ()); $nbt->setInt("TileZ", $blockClicked->getFloorZ());
$entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt); $entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt);
if($entity instanceof Entity){ if($entity instanceof Entity){
--$this->count; --$this->count;
$entity->spawnToAll(); $entity->spawnToAll();
$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;