From 2103c981a969847bbcde7d1c77cb378eba48d715 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Fri, 4 Aug 2017 13:33:23 +0100 Subject: [PATCH] Replaced literal ints with Vector3 constants for Block->getSide() calls --- src/pocketmine/block/BrownMushroom.php | 5 +++-- src/pocketmine/block/Cactus.php | 14 +++++++------- src/pocketmine/block/Cake.php | 5 +++-- src/pocketmine/block/Carpet.php | 5 +++-- src/pocketmine/block/Chest.php | 3 ++- src/pocketmine/block/Dandelion.php | 5 +++-- src/pocketmine/block/DeadBush.php | 3 ++- src/pocketmine/block/Door.php | 16 ++++++++-------- src/pocketmine/block/Fire.php | 3 ++- src/pocketmine/block/Flower.php | 2 +- src/pocketmine/block/FlowerPot.php | 2 +- src/pocketmine/block/Grass.php | 2 +- src/pocketmine/block/Leaves.php | 24 ++++++++++++------------ src/pocketmine/block/MelonStem.php | 2 +- src/pocketmine/block/Mycelium.php | 2 +- src/pocketmine/block/PumpkinStem.php | 2 +- src/pocketmine/block/RedMushroom.php | 5 +++-- src/pocketmine/block/Sapling.php | 5 +++-- src/pocketmine/block/Sugarcane.php | 16 ++++++++-------- src/pocketmine/block/TallGrass.php | 5 +++-- src/pocketmine/block/Thin.php | 9 +++++---- src/pocketmine/block/Torch.php | 5 +++-- src/pocketmine/block/WaterLily.php | 2 +- 23 files changed, 77 insertions(+), 65 deletions(-) diff --git a/src/pocketmine/block/BrownMushroom.php b/src/pocketmine/block/BrownMushroom.php index 0b54d1a39..f82ba5913 100644 --- a/src/pocketmine/block/BrownMushroom.php +++ b/src/pocketmine/block/BrownMushroom.php @@ -25,6 +25,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; class BrownMushroom extends Flowable{ @@ -45,7 +46,7 @@ class BrownMushroom extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; @@ -56,7 +57,7 @@ class BrownMushroom extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->isTransparent() === false){ $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Cactus.php b/src/pocketmine/block/Cactus.php index fd39c2450..1402dc984 100644 --- a/src/pocketmine/block/Cactus.php +++ b/src/pocketmine/block/Cactus.php @@ -73,7 +73,7 @@ class Cactus extends Transparent{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() !== self::SAND and $down->getId() !== self::CACTUS){ $this->getLevel()->useBreakOn($this); }else{ @@ -85,7 +85,7 @@ class Cactus extends Transparent{ } } }elseif($type === Level::BLOCK_UPDATE_RANDOM){ - if($this->getSide(0)->getId() !== self::CACTUS){ + if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::CACTUS){ if($this->meta === 0x0f){ for($y = 1; $y < 3; ++$y){ $b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z)); @@ -109,12 +109,12 @@ class Cactus extends Transparent{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === self::SAND or $down->getId() === self::CACTUS){ - $block0 = $this->getSide(2); - $block1 = $this->getSide(3); - $block2 = $this->getSide(4); - $block3 = $this->getSide(5); + $block0 = $this->getSide(Vector3::SIDE_NORTH); + $block1 = $this->getSide(Vector3::SIDE_SOUTH); + $block2 = $this->getSide(Vector3::SIDE_WEST); + $block3 = $this->getSide(Vector3::SIDE_EAST); if($block0->isTransparent() === true and $block1->isTransparent() === true and $block2->isTransparent() === true and $block3->isTransparent() === true){ $this->getLevel()->setBlock($this, $this, true); diff --git a/src/pocketmine/block/Cake.php b/src/pocketmine/block/Cake.php index fb508e21b..390373913 100644 --- a/src/pocketmine/block/Cake.php +++ b/src/pocketmine/block/Cake.php @@ -29,6 +29,7 @@ use pocketmine\item\FoodSource; use pocketmine\item\Item; use pocketmine\level\Level; use pocketmine\math\AxisAlignedBB; +use pocketmine\math\Vector3; use pocketmine\Player; class Cake extends Transparent implements FoodSource{ @@ -62,7 +63,7 @@ class Cake extends Transparent implements FoodSource{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() !== self::AIR){ $this->getLevel()->setBlock($block, $this, true, true); @@ -74,7 +75,7 @@ class Cake extends Transparent implements FoodSource{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method + if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method $this->getLevel()->setBlock($this, new Air(), true); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Carpet.php b/src/pocketmine/block/Carpet.php index 6201d86ba..80b956450 100644 --- a/src/pocketmine/block/Carpet.php +++ b/src/pocketmine/block/Carpet.php @@ -26,6 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; use pocketmine\math\AxisAlignedBB; +use pocketmine\math\Vector3; use pocketmine\Player; class Carpet extends Flowable{ @@ -79,7 +80,7 @@ class Carpet extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() !== self::AIR){ $this->getLevel()->setBlock($block, $this, true, true); @@ -91,7 +92,7 @@ class Carpet extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->getId() === self::AIR){ + if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Chest.php b/src/pocketmine/block/Chest.php index da5b512b5..9abedb956 100644 --- a/src/pocketmine/block/Chest.php +++ b/src/pocketmine/block/Chest.php @@ -26,6 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\item\Tool; use pocketmine\math\AxisAlignedBB; +use pocketmine\math\Vector3; use pocketmine\nbt\NBT; use pocketmine\nbt\tag\CompoundTag; use pocketmine\nbt\tag\IntTag; @@ -135,7 +136,7 @@ class Chest extends Transparent{ public function onActivate(Item $item, Player $player = null){ if($player instanceof Player){ - $top = $this->getSide(1); + $top = $this->getSide(Vector3::SIDE_UP); if($top->isTransparent() !== true){ return true; } diff --git a/src/pocketmine/block/Dandelion.php b/src/pocketmine/block/Dandelion.php index 640ef44f5..c086784ae 100644 --- a/src/pocketmine/block/Dandelion.php +++ b/src/pocketmine/block/Dandelion.php @@ -25,6 +25,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; class Dandelion extends Flowable{ @@ -41,7 +42,7 @@ class Dandelion extends Flowable{ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === 2 or $down->getId() === 3 or $down->getId() === 60){ $this->getLevel()->setBlock($block, $this, true, true); @@ -53,7 +54,7 @@ class Dandelion extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/DeadBush.php b/src/pocketmine/block/DeadBush.php index a2c2fec63..40c5f9ebd 100644 --- a/src/pocketmine/block/DeadBush.php +++ b/src/pocketmine/block/DeadBush.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\level\Level; +use pocketmine\math\Vector3; class DeadBush extends Flowable{ @@ -40,7 +41,7 @@ class DeadBush extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Door.php b/src/pocketmine/block/Door.php index 053d4a457..44799bc41 100644 --- a/src/pocketmine/block/Door.php +++ b/src/pocketmine/block/Door.php @@ -203,10 +203,10 @@ abstract class Door extends Transparent{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->getId() === self::AIR){ //Replace with common break method + if($this->getSide(Vector3::SIDE_DOWN)->getId() === self::AIR){ //Replace with common break method $this->getLevel()->setBlock($this, new Air(), false); - if($this->getSide(1) instanceof Door){ - $this->getLevel()->setBlock($this->getSide(1), new Air(), false); + if($this->getSide(Vector3::SIDE_UP) instanceof Door){ + $this->getLevel()->setBlock($this->getSide(Vector3::SIDE_UP), new Air(), false); } return Level::BLOCK_UPDATE_NORMAL; @@ -218,8 +218,8 @@ abstract class Door extends Transparent{ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ if($face === 1){ - $blockUp = $this->getSide(1); - $blockDown = $this->getSide(0); + $blockUp = $this->getSide(Vector3::SIDE_UP); + $blockDown = $this->getSide(Vector3::SIDE_DOWN); if($blockUp->canBeReplaced() === false or $blockDown->isTransparent() === true){ return false; } @@ -248,12 +248,12 @@ abstract class Door extends Transparent{ public function onBreak(Item $item){ if(($this->getDamage() & 0x08) === 0x08){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === $this->getId()){ $this->getLevel()->setBlock($down, new Air(), true); } }else{ - $up = $this->getSide(1); + $up = $this->getSide(Vector3::SIDE_UP); if($up->getId() === $this->getId()){ $this->getLevel()->setBlock($up, new Air(), true); } @@ -265,7 +265,7 @@ abstract class Door extends Transparent{ public function onActivate(Item $item, Player $player = null){ if(($this->getDamage() & 0x08) === 0x08){ //Top - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === $this->getId()){ $meta = $down->getDamage() ^ 0x04; $this->level->setBlock($down, Block::get($this->getId(), $meta), true); diff --git a/src/pocketmine/block/Fire.php b/src/pocketmine/block/Fire.php index b53e604d7..45120c692 100644 --- a/src/pocketmine/block/Fire.php +++ b/src/pocketmine/block/Fire.php @@ -31,6 +31,7 @@ use pocketmine\event\entity\EntityDamageByBlockEvent; use pocketmine\event\entity\EntityDamageEvent; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Server; class Fire extends Flowable{ @@ -93,7 +94,7 @@ class Fire extends Flowable{ return Level::BLOCK_UPDATE_NORMAL; }elseif($type === Level::BLOCK_UPDATE_RANDOM){ - if($this->getSide(0)->getId() !== self::NETHERRACK){ + if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::NETHERRACK){ if(mt_rand(0, 2) === 0){ if($this->meta === 0x0F){ $this->level->setBlock($this, new Air()); diff --git a/src/pocketmine/block/Flower.php b/src/pocketmine/block/Flower.php index ef52b8fa7..4fb79bc1c 100644 --- a/src/pocketmine/block/Flower.php +++ b/src/pocketmine/block/Flower.php @@ -69,7 +69,7 @@ class Flower extends Flowable{ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === Block::GRASS or $down->getId() === Block::DIRT or $down->getId() === Block::FARMLAND){ $this->getLevel()->setBlock($block, $this, true); diff --git a/src/pocketmine/block/FlowerPot.php b/src/pocketmine/block/FlowerPot.php index aa04ea545..45f065060 100644 --- a/src/pocketmine/block/FlowerPot.php +++ b/src/pocketmine/block/FlowerPot.php @@ -89,7 +89,7 @@ class FlowerPot extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Grass.php b/src/pocketmine/block/Grass.php index a7648c592..b4dc2582b 100644 --- a/src/pocketmine/block/Grass.php +++ b/src/pocketmine/block/Grass.php @@ -109,7 +109,7 @@ class Grass extends Solid{ $this->getLevel()->setBlock($this, new Farmland()); return true; - }elseif($item->isShovel() and $this->getSide(1)->getId() === Block::AIR){ + }elseif($item->isShovel() and $this->getSide(Vector3::SIDE_UP)->getId() === Block::AIR){ $item->useOn($this); $this->getLevel()->setBlock($this, new GrassPath()); diff --git a/src/pocketmine/block/Leaves.php b/src/pocketmine/block/Leaves.php index f65383cb9..d9fc15479 100644 --- a/src/pocketmine/block/Leaves.php +++ b/src/pocketmine/block/Leaves.php @@ -90,38 +90,38 @@ class Leaves extends Transparent{ }else{ //No more loops switch($fromSide){ case 2: - if($this->findLog($pos->getSide(2), $visited, $distance + 1, $check, $fromSide) === true){ + if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(4), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(5), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){ return true; } break; case 3: - if($this->findLog($pos->getSide(3), $visited, $distance + 1, $check, $fromSide) === true){ + if($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(4), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(5), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){ return true; } break; case 4: - if($this->findLog($pos->getSide(2), $visited, $distance + 1, $check, $fromSide) === true){ + if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(3), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(4), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_WEST), $visited, $distance + 1, $check, $fromSide) === true){ return true; } break; case 5: - if($this->findLog($pos->getSide(2), $visited, $distance + 1, $check, $fromSide) === true){ + if($this->findLog($pos->getSide(Vector3::SIDE_NORTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(3), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_SOUTH), $visited, $distance + 1, $check, $fromSide) === true){ return true; - }elseif($this->findLog($pos->getSide(5), $visited, $distance + 1, $check, $fromSide) === true){ + }elseif($this->findLog($pos->getSide(Vector3::SIDE_EAST), $visited, $distance + 1, $check, $fromSide) === true){ return true; } break; diff --git a/src/pocketmine/block/MelonStem.php b/src/pocketmine/block/MelonStem.php index 15932eb43..f8d53f028 100644 --- a/src/pocketmine/block/MelonStem.php +++ b/src/pocketmine/block/MelonStem.php @@ -66,7 +66,7 @@ class MelonStem extends Crops{ } } $side = $this->getSide(mt_rand(2, 5)); - $d = $side->getSide(0); + $d = $side->getSide(Vector3::SIDE_DOWN); if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){ Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Melon())); if(!$ev->isCancelled()){ diff --git a/src/pocketmine/block/Mycelium.php b/src/pocketmine/block/Mycelium.php index b8ffd62bd..4e6b4ba10 100644 --- a/src/pocketmine/block/Mycelium.php +++ b/src/pocketmine/block/Mycelium.php @@ -64,7 +64,7 @@ class Mycelium extends Solid{ $z = mt_rand($this->z - 1, $this->z + 1); $block = $this->getLevel()->getBlock(new Vector3($x, $y, $z)); if($block->getId() === Block::DIRT){ - if($block->getSide(1) instanceof Transparent){ + if($block->getSide(Vector3::SIDE_UP) instanceof Transparent){ Server::getInstance()->getPluginManager()->callEvent($ev = new BlockSpreadEvent($block, $this, new Mycelium())); if(!$ev->isCancelled()){ $this->getLevel()->setBlock($block, $ev->getNewState()); diff --git a/src/pocketmine/block/PumpkinStem.php b/src/pocketmine/block/PumpkinStem.php index 7259912df..8d5207b20 100644 --- a/src/pocketmine/block/PumpkinStem.php +++ b/src/pocketmine/block/PumpkinStem.php @@ -66,7 +66,7 @@ class PumpkinStem extends Crops{ } } $side = $this->getSide(mt_rand(2, 5)); - $d = $side->getSide(0); + $d = $side->getSide(Vector3::SIDE_DOWN); if($side->getId() === self::AIR and ($d->getId() === self::FARMLAND or $d->getId() === self::GRASS or $d->getId() === self::DIRT)){ Server::getInstance()->getPluginManager()->callEvent($ev = new BlockGrowEvent($side, new Pumpkin())); if(!$ev->isCancelled()){ diff --git a/src/pocketmine/block/RedMushroom.php b/src/pocketmine/block/RedMushroom.php index a76c00ca1..79b1a0e62 100644 --- a/src/pocketmine/block/RedMushroom.php +++ b/src/pocketmine/block/RedMushroom.php @@ -25,6 +25,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; class RedMushroom extends Flowable{ @@ -42,7 +43,7 @@ class RedMushroom extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; @@ -53,7 +54,7 @@ class RedMushroom extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->isTransparent() === false){ $this->getLevel()->setBlock($block, $this, true, true); diff --git a/src/pocketmine/block/Sapling.php b/src/pocketmine/block/Sapling.php index ffc65df1f..f3dc41494 100644 --- a/src/pocketmine/block/Sapling.php +++ b/src/pocketmine/block/Sapling.php @@ -26,6 +26,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\generator\object\Tree; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; use pocketmine\utils\Random; @@ -59,7 +60,7 @@ class Sapling extends Flowable{ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::FARMLAND){ $this->getLevel()->setBlock($block, $this, true, true); @@ -85,7 +86,7 @@ class Sapling extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Sugarcane.php b/src/pocketmine/block/Sugarcane.php index 4dfb58630..2680b4efe 100644 --- a/src/pocketmine/block/Sugarcane.php +++ b/src/pocketmine/block/Sugarcane.php @@ -51,7 +51,7 @@ class Sugarcane extends Flowable{ public function onActivate(Item $item, Player $player = null){ if($item->getId() === Item::DYE and $item->getDamage() === 0x0F){ //Bonemeal - if($this->getSide(0)->getId() !== self::SUGARCANE_BLOCK){ + if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){ for($y = 1; $y < 3; ++$y){ $b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z)); if($b->getId() === self::AIR){ @@ -77,14 +77,14 @@ class Sugarcane extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->isTransparent() === true and $down->getId() !== self::SUGARCANE_BLOCK){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; } }elseif($type === Level::BLOCK_UPDATE_RANDOM){ - if($this->getSide(0)->getId() !== self::SUGARCANE_BLOCK){ + if($this->getSide(Vector3::SIDE_DOWN)->getId() !== self::SUGARCANE_BLOCK){ if($this->meta === 0x0F){ for($y = 1; $y < 3; ++$y){ $b = $this->getLevel()->getBlock(new Vector3($this->x, $this->y + $y, $this->z)); @@ -108,16 +108,16 @@ class Sugarcane extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === self::SUGARCANE_BLOCK){ $this->getLevel()->setBlock($block, new Sugarcane(), true); return true; }elseif($down->getId() === self::GRASS or $down->getId() === self::DIRT or $down->getId() === self::SAND){ - $block0 = $down->getSide(2); - $block1 = $down->getSide(3); - $block2 = $down->getSide(4); - $block3 = $down->getSide(5); + $block0 = $down->getSide(Vector3::SIDE_NORTH); + $block1 = $down->getSide(Vector3::SIDE_SOUTH); + $block2 = $down->getSide(Vector3::SIDE_WEST); + $block3 = $down->getSide(Vector3::SIDE_EAST); if(($block0 instanceof Water) or ($block1 instanceof Water) or ($block2 instanceof Water) or ($block3 instanceof Water)){ $this->getLevel()->setBlock($block, new Sugarcane(), true); diff --git a/src/pocketmine/block/TallGrass.php b/src/pocketmine/block/TallGrass.php index 8c090a118..e836bc902 100644 --- a/src/pocketmine/block/TallGrass.php +++ b/src/pocketmine/block/TallGrass.php @@ -25,6 +25,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; class TallGrass extends Flowable{ @@ -50,7 +51,7 @@ class TallGrass extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $down = $this->getSide(0); + $down = $this->getSide(Vector3::SIDE_DOWN); if($down->getId() === self::GRASS){ $this->getLevel()->setBlock($block, $this, true); @@ -63,7 +64,7 @@ class TallGrass extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if($this->getSide(0)->isTransparent() === true){ //Replace with common break method + if($this->getSide(Vector3::SIDE_DOWN)->isTransparent() === true){ //Replace with common break method $this->getLevel()->setBlock($this, new Air(), true, true); return Level::BLOCK_UPDATE_NORMAL; diff --git a/src/pocketmine/block/Thin.php b/src/pocketmine/block/Thin.php index f780d3cd5..ef121b847 100644 --- a/src/pocketmine/block/Thin.php +++ b/src/pocketmine/block/Thin.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace pocketmine\block; use pocketmine\math\AxisAlignedBB; +use pocketmine\math\Vector3; abstract class Thin extends Transparent{ @@ -38,10 +39,10 @@ abstract class Thin extends Transparent{ $f2 = 0.4375; $f3 = 0.5625; - $flag = $this->canConnect($this->getSide(2)); - $flag1 = $this->canConnect($this->getSide(3)); - $flag2 = $this->canConnect($this->getSide(4)); - $flag3 = $this->canConnect($this->getSide(5)); + $flag = $this->canConnect($this->getSide(Vector3::SIDE_NORTH)); + $flag1 = $this->canConnect($this->getSide(Vector3::SIDE_SOUTH)); + $flag2 = $this->canConnect($this->getSide(Vector3::SIDE_WEST)); + $flag3 = $this->canConnect($this->getSide(Vector3::SIDE_EAST)); if((!$flag2 or !$flag3) and ($flag2 or $flag3 or $flag or $flag1)){ if($flag2 and !$flag3){ diff --git a/src/pocketmine/block/Torch.php b/src/pocketmine/block/Torch.php index ee6fe4334..5f15588f5 100644 --- a/src/pocketmine/block/Torch.php +++ b/src/pocketmine/block/Torch.php @@ -25,6 +25,7 @@ namespace pocketmine\block; use pocketmine\item\Item; use pocketmine\level\Level; +use pocketmine\math\Vector3; use pocketmine\Player; class Torch extends Flowable{ @@ -46,7 +47,7 @@ class Torch extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - $below = $this->getSide(0); + $below = $this->getSide(Vector3::SIDE_DOWN); $side = $this->getDamage(); $faces = [ 0 => 0, @@ -68,7 +69,7 @@ class Torch extends Flowable{ } public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ - $below = $this->getSide(0); + $below = $this->getSide(Vector3::SIDE_DOWN); if($target->isTransparent() === false and $face !== 0){ $faces = [ diff --git a/src/pocketmine/block/WaterLily.php b/src/pocketmine/block/WaterLily.php index 6bc3188cc..869c8121f 100644 --- a/src/pocketmine/block/WaterLily.php +++ b/src/pocketmine/block/WaterLily.php @@ -71,7 +71,7 @@ class WaterLily extends Flowable{ public function onUpdate($type){ if($type === Level::BLOCK_UPDATE_NORMAL){ - if(!($this->getSide(0) instanceof Water)){ + if(!($this->getSide(Vector3::SIDE_DOWN) instanceof Water)){ $this->getLevel()->useBreakOn($this); return Level::BLOCK_UPDATE_NORMAL; }