diff --git a/src/pocketmine/CrashDump.php b/src/pocketmine/CrashDump.php index 3c981a4b9..96ebccb66 100644 --- a/src/pocketmine/CrashDump.php +++ b/src/pocketmine/CrashDump.php @@ -160,7 +160,7 @@ class CrashDump{ ]; $error["fullFile"] = $error["file"]; $error["file"] = cleanPath($error["file"]); - $error["type"] = isset($errorConversion[$error["type"]]) ? $errorConversion[$error["type"]] : $error["type"]; + $error["type"] = $errorConversion[$error["type"]] ?? $error["type"]; if(($pos = strpos($error["message"], "\n")) !== false){ $error["message"] = substr($error["message"], 0, $pos); } diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index f20cdc342..27adefe49 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -2381,7 +2381,7 @@ class Player extends Human implements CommandSender, InventoryHolder, ChunkLoade ]; $damage = [ - EntityDamageEvent::MODIFIER_BASE => isset($damageTable[$item->getId()]) ? $damageTable[$item->getId()] : 1, + EntityDamageEvent::MODIFIER_BASE => $damageTable[$item->getId()] ?? 1, ]; if(!$this->canInteract($target, 8)){ diff --git a/src/pocketmine/item/Item.php b/src/pocketmine/item/Item.php index 02f74ed83..eab5a0ae2 100644 --- a/src/pocketmine/item/Item.php +++ b/src/pocketmine/item/Item.php @@ -272,7 +272,7 @@ class Item implements ItemIds, \JsonSerializable{ * @return Item */ public static function getCreativeItem(int $index){ - return isset(Item::$creative[$index]) ? Item::$creative[$index] : null; + return Item::$creative[$index] ?? null; } public static function getCreativeItemIndex(Item $item) : int{ @@ -597,7 +597,7 @@ class Item implements ItemIds, \JsonSerializable{ public function getNamedTagEntry($name){ $tag = $this->getNamedTag(); if($tag !== null){ - return isset($tag->{$name}) ? $tag->{$name} : null; + return $tag->{$name} ?? null; } return null; diff --git a/src/pocketmine/level/Level.php b/src/pocketmine/level/Level.php index d831fb491..22565e869 100644 --- a/src/pocketmine/level/Level.php +++ b/src/pocketmine/level/Level.php @@ -532,7 +532,7 @@ class Level implements ChunkManager, Metadatable{ * @return Player[] */ public function getChunkPlayers(int $chunkX, int $chunkZ) : array{ - return isset($this->playerLoaders[$index = Level::chunkHash($chunkX, $chunkZ)]) ? $this->playerLoaders[$index] : []; + return $this->playerLoaders[Level::chunkHash($chunkX, $chunkZ)] ?? []; } /** @@ -544,7 +544,7 @@ class Level implements ChunkManager, Metadatable{ * @return ChunkLoader[] */ public function getChunkLoaders(int $chunkX, int $chunkZ) : array{ - return isset($this->chunkLoaders[$index = Level::chunkHash($chunkX, $chunkZ)]) ? $this->chunkLoaders[$index] : []; + return $this->chunkLoaders[Level::chunkHash($chunkX, $chunkZ)] ?? []; } public function addChunkPacket(int $chunkX, int $chunkZ, DataPacket $packet){ @@ -888,7 +888,7 @@ class Level implements ChunkManager, Metadatable{ $chunkZ = $loader->getZ() >> 4; $index = Level::chunkHash($chunkX, $chunkZ); - $existingLoaders = max(0, isset($this->chunkTickList[$index]) ? $this->chunkTickList[$index] : 0); + $existingLoaders = max(0, $this->chunkTickList[$index] ?? 0); $this->chunkTickList[$index] = $existingLoaders + 1; for($chunk = 0; $chunk < $chunksPerLoader; ++$chunk){ $dx = mt_rand(-$randRange, $randRange); @@ -1769,7 +1769,7 @@ class Level implements ChunkManager, Metadatable{ * @return Entity */ public function getEntity(int $entityId){ - return isset($this->entities[$entityId]) ? $this->entities[$entityId] : null; + return $this->entities[$entityId] ?? null; } /** @@ -1856,7 +1856,7 @@ class Level implements ChunkManager, Metadatable{ * @return Tile */ public function getTileById(int $tileId){ - return isset($this->tiles[$tileId]) ? $this->tiles[$tileId] : null; + return $this->tiles[$tileId] ?? null; } /** diff --git a/src/pocketmine/level/SimpleChunkManager.php b/src/pocketmine/level/SimpleChunkManager.php index 4f0d5b8ec..56931f0b1 100644 --- a/src/pocketmine/level/SimpleChunkManager.php +++ b/src/pocketmine/level/SimpleChunkManager.php @@ -103,7 +103,7 @@ class SimpleChunkManager implements ChunkManager{ * @return FullChunk|null */ public function getChunk(int $chunkX, int $chunkZ){ - return isset($this->chunks[$index = Level::chunkHash($chunkX, $chunkZ)]) ? $this->chunks[$index] : null; + return $this->chunks[Level::chunkHash($chunkX, $chunkZ)] ?? null; } /** diff --git a/src/pocketmine/level/format/LevelProviderManager.php b/src/pocketmine/level/format/LevelProviderManager.php index 0ef74c782..70e4bb10d 100644 --- a/src/pocketmine/level/format/LevelProviderManager.php +++ b/src/pocketmine/level/format/LevelProviderManager.php @@ -62,6 +62,6 @@ abstract class LevelProviderManager{ public static function getProviderByName($name){ $name = trim(strtolower($name)); - return isset(self::$providers[$name]) ? self::$providers[$name] : null; + return self::$providers[$name] ?? null; } } \ No newline at end of file diff --git a/src/pocketmine/level/format/anvil/Anvil.php b/src/pocketmine/level/format/anvil/Anvil.php index b48a5ec2f..88fe9c11f 100644 --- a/src/pocketmine/level/format/anvil/Anvil.php +++ b/src/pocketmine/level/format/anvil/Anvil.php @@ -117,7 +117,7 @@ class Anvil extends McRegion{ * @return RegionLoader */ protected function getRegion($x, $z){ - return isset($this->regions[$index = Level::chunkHash($x, $z)]) ? $this->regions[$index] : null; + return $this->regions[Level::chunkHash($x, $z)] ?? null; } /** diff --git a/src/pocketmine/level/format/generic/BaseFullChunk.php b/src/pocketmine/level/format/generic/BaseFullChunk.php index 0cc8aa6a0..d9c2ecc23 100644 --- a/src/pocketmine/level/format/generic/BaseFullChunk.php +++ b/src/pocketmine/level/format/generic/BaseFullChunk.php @@ -355,8 +355,7 @@ abstract class BaseFullChunk implements FullChunk{ } public function getTile($x, $y, $z){ - $index = ($z << 12) | ($x << 8) | $y; - return isset($this->tileList[$index]) ? $this->tileList[$index] : null; + return $this->tileList[($z << 12) | ($x << 8) | $y] ?? null; } public function isLoaded(){ diff --git a/src/pocketmine/level/format/mcregion/McRegion.php b/src/pocketmine/level/format/mcregion/McRegion.php index 93d3a76cf..f876cd197 100644 --- a/src/pocketmine/level/format/mcregion/McRegion.php +++ b/src/pocketmine/level/format/mcregion/McRegion.php @@ -220,7 +220,7 @@ class McRegion extends BaseLevelProvider{ } public function unloadChunk($x, $z, $safe = true){ - $chunk = isset($this->chunks[$index = Level::chunkHash($x, $z)]) ? $this->chunks[$index] : null; + $chunk = $this->chunks[$index = Level::chunkHash($x, $z)] ?? null; if($chunk instanceof FullChunk and $chunk->unload(false, $safe)){ unset($this->chunks[$index]); return true; @@ -246,7 +246,7 @@ class McRegion extends BaseLevelProvider{ * @return RegionLoader */ protected function getRegion($x, $z){ - return isset($this->regions[$index = Level::chunkHash($x, $z)]) ? $this->regions[$index] : null; + return $this->regions[Level::chunkHash($x, $z)] ?? null; } /** diff --git a/src/pocketmine/level/generator/Flat.php b/src/pocketmine/level/generator/Flat.php index a77cb5364..84a384521 100644 --- a/src/pocketmine/level/generator/Flat.php +++ b/src/pocketmine/level/generator/Flat.php @@ -87,9 +87,9 @@ class Flat extends Generator{ $this->preset = $preset; $preset = explode(";", $preset); $version = (int) $preset[0]; - $blocks = isset($preset[1]) ? $preset[1] : ""; - $biome = isset($preset[2]) ? $preset[2] : 1; - $options = isset($preset[3]) ? $preset[3] : ""; + $blocks = $preset[1] ?? ""; + $biome = $preset[2] ?? 1; + $options = $preset[3] ?? ""; preg_match_all('#^(([0-9]*x|)([0-9]{1,3})(|:[0-9]{0,2}))$#m', str_replace(",", "\n", $blocks), $matches); $y = 0; $this->structure = []; diff --git a/src/pocketmine/level/generator/biome/Biome.php b/src/pocketmine/level/generator/biome/Biome.php index 1f3aa8913..37bce0ae3 100644 --- a/src/pocketmine/level/generator/biome/Biome.php +++ b/src/pocketmine/level/generator/biome/Biome.php @@ -107,7 +107,7 @@ abstract class Biome{ * @return Biome */ public static function getBiome($id){ - return isset(self::$biomes[$id]) ? self::$biomes[$id] : self::$biomes[self::OCEAN]; + return self::$biomes[$id] ?? self::$biomes[self::OCEAN]; } public function clearPopulators(){ diff --git a/src/pocketmine/level/generator/biome/BiomeSelector.php b/src/pocketmine/level/generator/biome/BiomeSelector.php index 68da75484..30411b111 100644 --- a/src/pocketmine/level/generator/biome/BiomeSelector.php +++ b/src/pocketmine/level/generator/biome/BiomeSelector.php @@ -81,6 +81,6 @@ class BiomeSelector{ $rainfall = (int) ($this->getRainfall($x, $z) * 63); $biomeId = $this->map[$temperature + ($rainfall << 6)]; - return isset($this->biomes[$biomeId]) ? $this->biomes[$biomeId] : $this->fallback; + return $this->biomes[$biomeId] ?? $this->fallback; } } \ No newline at end of file diff --git a/src/pocketmine/nbt/NBT.php b/src/pocketmine/nbt/NBT.php index 38e911455..aa8f16869 100644 --- a/src/pocketmine/nbt/NBT.php +++ b/src/pocketmine/nbt/NBT.php @@ -290,7 +290,7 @@ class NBT{ throw new \Exception("Syntax error: invalid quote at offset $offset"); } }elseif($c === "\\"){ - $value .= isset($data{$offset + 1}) ? $data{$offset + 1} : ""; + $value .= $data{$offset + 1} ?? ""; ++$offset; }elseif($c === "{" and !$inQuotes){ if($value !== ""){ diff --git a/src/pocketmine/updater/AutoUpdater.php b/src/pocketmine/updater/AutoUpdater.php index 1b3e9f9f5..ebf1dcb95 100644 --- a/src/pocketmine/updater/AutoUpdater.php +++ b/src/pocketmine/updater/AutoUpdater.php @@ -68,7 +68,7 @@ class AutoUpdater{ "api_version" => $response["api_version"], "build" => $response["build"], "date" => $response["date"], - "details_url" => isset($response["details_url"]) ? $response["details_url"] : null, + "details_url" => $response["details_url"] ?? null, "download_url" => $response["download_url"] ]; diff --git a/src/pocketmine/utils/MainLogger.php b/src/pocketmine/utils/MainLogger.php index 4259f1edf..7afe1d627 100644 --- a/src/pocketmine/utils/MainLogger.php +++ b/src/pocketmine/utils/MainLogger.php @@ -133,7 +133,7 @@ class MainLogger extends \AttachableThreadedLogger{ }else{ $type = ($errno === E_ERROR or $errno === E_USER_ERROR) ? LogLevel::ERROR : (($errno === E_USER_WARNING or $errno === E_WARNING) ? LogLevel::WARNING : LogLevel::NOTICE); } - $errno = isset($errorConversion[$errno]) ? $errorConversion[$errno] : $errno; + $errno = $errorConversion[$errno] ?? $errno; if(($pos = strpos($errstr, "\n")) !== false){ $errstr = substr($errstr, 0, $pos); }