From a4b7fbf2dff91e60fcd579ec0df5e4b6282a0fc7 Mon Sep 17 00:00:00 2001 From: kotyara <62548070+kotyaralih@users.noreply.github.com> Date: Fri, 15 Mar 2024 20:13:32 +0500 Subject: [PATCH] some CS --- src/API/AchievementAPI.php | 2 +- src/API/EntityAPI.php | 2 +- src/entity/Animal.php | 2 +- src/entity/Entity.php | 2 +- src/entity/Living.php | 2 +- src/entity/monster/Spider.php | 2 +- src/entity/object/FallingSand.php | 2 +- src/material/block/StairBlock.php | 16 ++++++++-------- src/material/block/nonfull/FarmlandBlock.php | 2 +- src/world/Level.php | 16 ++++++++-------- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/API/AchievementAPI.php b/src/API/AchievementAPI.php index 166c9c1d..e28c5394 100644 --- a/src/API/AchievementAPI.php +++ b/src/API/AchievementAPI.php @@ -165,7 +165,7 @@ class AchievementAPI{ }else{ $data = $issuer->achievements; } - }else if(!($issuer instanceof Player) || $this->server->api->ban->isOp($issuer->iusername)){ + }elseif(!($issuer instanceof Player) || $this->server->api->ban->isOp($issuer->iusername)){ $player = $this->server->api->player->get($params[0]); $data = $player instanceof Player ? $player->data : $this->server->api->player->getOffline(trim($params[0]), false); }else{ diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index 2579490e..49d69bc0 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -226,7 +226,7 @@ class EntityAPI{ foreach($center->level->entityListPositioned[$ind] ?? [] as $ind2 => $entid){ if(isset($this->entities[$entid]) && $this->entities[$entid] instanceof Entity && ($class === false || $this->entities[$entid]->class == $class)){ $ents[$entid] = $this->entities[$entid]; - }else if(!isset($this->entities[$entid])){ + }elseif(!isset($this->entities[$entid])){ ConsoleAPI::debug("Removing entity from level array at index $ind/$ind2: $entid"); unset($center->level->entityListPositioned[$ind][$ind2]); } diff --git a/src/entity/Animal.php b/src/entity/Animal.php index 5adf6ba8..89fa2e44 100644 --- a/src/entity/Animal.php +++ b/src/entity/Animal.php @@ -65,7 +65,7 @@ abstract class Animal extends Creature implements Ageable, Breedable{ } if($this->isInLove() && !isset($this->level->entitiesInLove[$this->eid])){ $this->level->entitiesInLove[$this->eid] = true; - }else if(!$this->isInLove() && isset($this->level->entitiesInLove[$this->eid])){ + }elseif(!$this->isInLove() && isset($this->level->entitiesInLove[$this->eid])){ unset($this->level->entitiesInLove[$this->eid]); } } diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 5e99ef20..fa3c498a 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -703,7 +703,7 @@ class Entity extends Position ++$this->fire; if($this->fire == 0) $this->fire = 8; } - }else if($this->fire <= 0){ + }elseif($this->fire <= 0){ $this->fire = -$this->fireResistance; } diff --git a/src/entity/Living.php b/src/entity/Living.php index 53c565f4..5ed6ac24 100644 --- a/src/entity/Living.php +++ b/src/entity/Living.php @@ -179,7 +179,7 @@ abstract class Living extends Entity implements Pathfindable{ if($this->isCollidedHorizontally && $this->isFree($this->speedX, $this->speedY + 0.6 - $this->y + $prevPosY, $this->speedZ)){ $this->speedY = 0.3; } - }else if($this->inLava){ + }elseif($this->inLava){ $prevPosY = $this->y; $this->moveFlying($strafe, $forward, 0.02); $this->move($this->speedX, $this->speedY, $this->speedZ); diff --git a/src/entity/monster/Spider.php b/src/entity/monster/Spider.php index 1a22d1eb..45a6ca26 100644 --- a/src/entity/monster/Spider.php +++ b/src/entity/monster/Spider.php @@ -27,7 +27,7 @@ class Spider extends Monster{ $this->speedY = 0.4; } return false; - }else if($distance <= 2.0){ + }elseif($distance <= 2.0){ return parent::attackEntity($entity, $distance); } diff --git a/src/entity/object/FallingSand.php b/src/entity/object/FallingSand.php index c29a8f94..10291dca 100644 --- a/src/entity/object/FallingSand.php +++ b/src/entity/object/FallingSand.php @@ -43,7 +43,7 @@ class FallingSand extends Entity{ $this->close(); //TODO vanilla-like checking? $this->level->fastSetBlockUpdate($x, $y, $z, $this->data["Tile"], 0); //TODO add metadata - }else if(($blockAt = $this->level->level->getBlockID($x, $y, $z)) != 0){ + }elseif(($blockAt = $this->level->level->getBlockID($x, $y, $z)) != 0){ //TODO vanilla-like checking? if(StaticBlock::getIsTransparent($blockAt) && !StaticBlock::getIsLiquid($blockAt)){ $this->close(); diff --git a/src/material/block/StairBlock.php b/src/material/block/StairBlock.php index 88d0a0ae..16851844 100644 --- a/src/material/block/StairBlock.php +++ b/src/material/block/StairBlock.php @@ -65,7 +65,7 @@ class StairBlock extends TransparentBlock{ if($blockMetaNearbyAnd3 == 3 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $blockMeta)){ $maxZ = 0.5; $v13 = false; - }else if($blockMetaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z - 1, $blockMeta)){ + }elseif($blockMetaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z - 1, $blockMeta)){ $minZ = 0.5; $v13 = false; } @@ -84,7 +84,7 @@ class StairBlock extends TransparentBlock{ if($blockMetaNearbyAnd3 == 3 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $blockMeta)){ $maxZ = 0.5; $v13 = false; - }else if($blockMetaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z - 1, $blockMeta)){ + }elseif($blockMetaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z - 1, $blockMeta)){ $minZ = 0.5; $v13 = false; } @@ -103,7 +103,7 @@ class StairBlock extends TransparentBlock{ if($blockMetaNearbyAnd3 == 1 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $blockMeta)){ $maxX = 0.5; $v13 = false; - }else if($blockMetaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $blockMeta)){ + }elseif($blockMetaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $blockMeta)){ $minX = 0.5; $v13 = false; } @@ -119,7 +119,7 @@ class StairBlock extends TransparentBlock{ if($blockMetaNearbyAnd3 == 1 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $blockMeta)){ $maxX = 0.5; $v13 = false; - }else if($blockMetaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $blockMeta)){ + }elseif($blockMetaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $blockMeta)){ $minX = 0.5; $v13 = false; } @@ -159,7 +159,7 @@ class StairBlock extends TransparentBlock{ $minZ = 0; $maxZ = 0.5; $v13 = true; - }else if($metaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $meta)){ + }elseif($metaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $meta)){ $minZ = 0.5; $maxZ = 1.0; $v13 = true; @@ -179,7 +179,7 @@ class StairBlock extends TransparentBlock{ $minZ = 0; $maxZ = 0.5; $v13 = true; - }else if($metaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $meta)){ + }elseif($metaNearbyAnd3 == 2 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x, $y, $z + 1, $meta)){ $minZ = 0.5; $maxZ = 1.0; $v13 = true; @@ -198,7 +198,7 @@ class StairBlock extends TransparentBlock{ if($metaNearbyAnd3 == 1 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $meta)){ $v13 = true; - }else if($metaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $meta)){ + }elseif($metaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $meta)){ $minX = 0.5; $maxX = 1.0; $v13 = true; @@ -216,7 +216,7 @@ class StairBlock extends TransparentBlock{ if($metaNearbyAnd3 == 1 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x - 1, $y, $z, $meta)){ $v13 = true; - }else if($metaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $meta)){ + }elseif($metaNearbyAnd3 == 0 && !self::isStairsAtXYZAndAreTheirMetadataSame($level, $x + 1, $y, $z, $meta)){ $minX = 0.5; $maxX = 1.0; $v13 = true; diff --git a/src/material/block/nonfull/FarmlandBlock.php b/src/material/block/nonfull/FarmlandBlock.php index 59be4fac..3eb447c6 100644 --- a/src/material/block/nonfull/FarmlandBlock.php +++ b/src/material/block/nonfull/FarmlandBlock.php @@ -32,7 +32,7 @@ class FarmlandBlock extends TransparentBlock{ $b = $level->level->getBlockID($x, $y + 1, $z); if(!StaticBlock::getIsFlowable($b)){ $level->fastSetBlockUpdate($x, $y, $z, DIRT, 0, true); - }else if($meta === 0 && mt_rand(0, 5) === 0){ + }elseif($meta === 0 && mt_rand(0, 5) === 0){ $water = self::checkWaterStatic($level, $x, $y, $z); if($water){ $level->fastSetBlockUpdate($x, $y, $z, FARMLAND, 1, true); diff --git a/src/world/Level.php b/src/world/Level.php index f2870ffd..168dff6c 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -115,15 +115,15 @@ class Level{ $v15 = $v17 = $v19 = 999.0; //nice mojang if($xEnd > $xStart) $v15 = $xStart + 1; - else if($xEnd < $xStart) $v15 = $xStart; + elseif($xEnd < $xStart) $v15 = $xStart; else $v39 = false; if($yEnd > $yStart) $v17 = $yStart + 1; - else if($yEnd < $yStart) $v17 = $yStart; + elseif($yEnd < $yStart) $v17 = $yStart; else $v40 = false; if($zEnd > $zStart) $v19 = $zStart + 1; - else if($zEnd < $zStart) $v19 = $zStart; + elseif($zEnd < $zStart) $v19 = $zStart; else $v41 = false; $v21 = $v23 = $v25 = 999.0; //nice mojang x2 @@ -142,7 +142,7 @@ class Level{ $start->x = $v15; $start->y += $v29 * $v21; $start->z += $v31 * $v21; - }else if($v23 < $v25){ + }elseif($v23 < $v25){ $v42 = $yEnd > $yStart ? 0 : 1; $start->x += $v27 * $v23; @@ -549,13 +549,13 @@ class Level{ } if($e->level != $this && isset($this->entityListPositioned["$curChunkX $curChunkZ"])){ unset($this->entityListPositioned["$curChunkX $curChunkZ"][$e->eid]); - }else if($curChunkX != $newChunkX || $curChunkZ != $newChunkZ){ + }elseif($curChunkX != $newChunkX || $curChunkZ != $newChunkZ){ $index = "$curChunkX $curChunkZ"; //while creating index like $curChunkX << 32 | $curChunkZ is faster, placing it inside list is slow $newIndex = "$newChunkX $newChunkZ"; unset($this->entityListPositioned[$index][$e->eid]); $this->entityListPositioned[$newIndex][$e->eid] = $e->eid; //set to e->eid to avoid possible memory leaks } - }else if(isset($this->entityListPositioned["$curChunkX $curChunkZ"])){ + }elseif(isset($this->entityListPositioned["$curChunkX $curChunkZ"])){ unset($this->entityListPositioned["$curChunkX $curChunkZ"][$k]); } } @@ -623,7 +623,7 @@ class Level{ foreach($this->entityListPositioned[$ind] ?? [] as $ind2 => $entid){ if(isset($this->entityList[$entid]) && $this->entityList[$entid] instanceof Entity && $this->entityList[$entid]->class === $class && $this->entityList[$entid]->boundingBox->intersectsWith($bb)){ $ents[$entid] = $this->entityList[$entid]; - }else if(!isset($this->entityList[$entid])){ + }elseif(!isset($this->entityList[$entid])){ ConsoleAPI::debug("Removing entity from level array at index $ind/$ind2: $entid"); unset($this->entityListPositioned[$ind][$ind2]); } @@ -646,7 +646,7 @@ class Level{ foreach($this->entityListPositioned[$ind] ?? [] as $ind2 => $entid){ if(isset($this->entityList[$entid]) && $this->entityList[$entid] instanceof Entity && $this->entityList[$entid]->boundingBox->intersectsWith($bb)){ $ents[$entid] = $this->entityList[$entid]; - }else if(!isset($this->entityList[$entid])){ + }elseif(!isset($this->entityList[$entid])){ ConsoleAPI::debug("Removing entity from level array at index $ind/$ind2: $entid"); unset($this->entityListPositioned[$ind][$ind2]); }