From 7877b4fe940cefaf759c97e0fbcc827e123eb5c5 Mon Sep 17 00:00:00 2001 From: ArkQuark <74979909+ArkQuark@users.noreply.github.com> Date: Thu, 16 Jun 2022 20:54:07 +0300 Subject: [PATCH] PHP 7.4.21 fixes part 2 --- src/PocketMinecraftServer.php | 2 +- src/material/block/misc/NetherReactor.php | 10 +++++----- src/material/block/nonfull/Rail.php | 6 +++--- src/network/RCON.php | 12 ++++++------ src/network/raknet/RakNetDataPacket.php | 2 +- src/network/raknet/RakNetParser.php | 2 +- src/utils/NBT.php | 2 +- src/utils/Utils.php | 4 ++-- src/utils/pthreads.php | 4 ++-- .../generator/object/NetherReactorStructure.php | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 129debdc..026b526f 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -281,7 +281,7 @@ class PocketMinecraftServer{ if(defined("NO_THREADS")){ return false; } - if(isset($this->asyncThread->output{5})){ + if(isset($this->asyncThread->output[5])){ $offset = 0; $ID = Utils::readInt(substr($this->asyncThread->output, $offset, 4)); $offset += 4; diff --git a/src/material/block/misc/NetherReactor.php b/src/material/block/misc/NetherReactor.php index 048fd4d5..f9e90438 100644 --- a/src/material/block/misc/NetherReactor.php +++ b/src/material/block/misc/NetherReactor.php @@ -201,26 +201,26 @@ class NetherReactorBlock extends SolidBlock{ switch($char){ case "G": if($this->level->getBlock(new Vector3($x + $offsetX, $y + $yOffset, $z + $offsetZ))->getID() === GOLD_BLOCK){ - continue; + continue 2; } return false; case "C": if($this->level->getBlock(new Vector3($x + $offsetX, $y + $yOffset, $z + $offsetZ))->getID() === COBBLESTONE){ - continue; + continue 2; } return false; case "R": if($this->level->getBlock(new Vector3($x + $offsetX, $y + $yOffset, $z + $offsetZ))->getID() === NETHER_REACTOR){ - continue; + continue 2; } return false; case " ": if($this->level->getBlock(new Vector3($x + $offsetX, $y + $yOffset, $z + $offsetZ))->getID() === 0){ - continue; + continue 2; } return false; default: - continue; + continue 2; } ++$offsetX; } diff --git a/src/material/block/nonfull/Rail.php b/src/material/block/nonfull/Rail.php index d3c0f1b3..0a4341a7 100644 --- a/src/material/block/nonfull/Rail.php +++ b/src/material/block/nonfull/Rail.php @@ -92,9 +92,9 @@ class RailBlock extends FlowableBlock{ } foreach($deltaY as $y){ $v3 = new Vector3( - $rail.getFloorX() + $blocks[1][0], - $rail.getFloorY() + $y, - $rail.getFloorZ() + $blocks[1][1] + $rail->getFloorX() + $blocks[1][0], + $rail->getFloorY() + $y, + $rail->getFloorZ() + $blocks[1][1] ); $idToConnect = $rail->level->getBlock(v3.getFloorX(), v3.getFloorY(), v3.getFloorZ())->getID(); $metaToConnect = $rail->level->getBlock(v3.getFloorX(), v3.getFloorY(), v3.getFloorZ())->getMetadata(); diff --git a/src/network/RCON.php b/src/network/RCON.php index 59929a0d..4d0123c5 100644 --- a/src/network/RCON.php +++ b/src/network/RCON.php @@ -168,21 +168,21 @@ class RCONInstance extends Thread{ if($this->{"status".$n} !== -1 and $this->stop !== true){ if($this->{"status".$n} === 0 and $this->{"timeout".$n} < microtime(true)){ //Timeout $this->{"status".$n} = -1; - continue; + continue 2; } $p = $this->readPacket($client, $size, $requestID, $packetType, $payload); if($p === false){ $this->{"status".$n} = -1; - continue; + continue 2; }elseif($p === null){ - continue; + continue 2; } switch($packetType){ case 3: //Login if($this->{"status".$n} !== 0){ $this->{"status".$n} = -1; - continue; + continue 2; } if($payload === $this->password){ @socket_getpeername($client, $addr, $port); @@ -194,13 +194,13 @@ class RCONInstance extends Thread{ }else{ $this->{"status".$n} = -1; $this->writePacket($client, -1, 2, ""); - continue; + continue 2; } break; case 2: //Command if($this->{"status".$n} !== 1){ $this->{"status".$n} = -1; - continue; + continue 2; } if(strlen($payload) > 0){ $this->cmd = ltrim($payload); diff --git a/src/network/raknet/RakNetDataPacket.php b/src/network/raknet/RakNetDataPacket.php index 293a7b6e..e4ab0c40 100755 --- a/src/network/raknet/RakNetDataPacket.php +++ b/src/network/raknet/RakNetDataPacket.php @@ -165,6 +165,6 @@ abstract class RakNetDataPacket extends stdClass{ } protected function feof(){ - return !isset($this->buffer{$this->offset}); + return !isset($this->buffer[$this->offset]); } } diff --git a/src/network/raknet/RakNetParser.php b/src/network/raknet/RakNetParser.php index 5f8f8440..0e82f4fd 100644 --- a/src/network/raknet/RakNetParser.php +++ b/src/network/raknet/RakNetParser.php @@ -68,7 +68,7 @@ class RakNetParser{ private function feof(){ - return !isset($this->buffer{$this->offset}); + return !isset($this->buffer[$this->offset]); } private function parse(){ diff --git a/src/utils/NBT.php b/src/utils/NBT.php index f85f637b..e18ce01c 100644 --- a/src/utils/NBT.php +++ b/src/utils/NBT.php @@ -45,7 +45,7 @@ class NBT{ } private function feof(){ - return !isset($this->binary{$this->offset}); + return !isset($this->binary[$this->offset]); } public function write($bin){ diff --git a/src/utils/Utils.php b/src/utils/Utils.php index d865878c..83cebcc1 100644 --- a/src/utils/Utils.php +++ b/src/utils/Utils.php @@ -265,7 +265,7 @@ class Utils{ public static function readDataArray($str, $len = 10, &$offset = null){ $data = array(); $offset = 0; - for($i = 1; $i <= $len and isset($str{$offset}); ++$i){ + for($i = 1; $i <= $len and isset($str[$offset]); ++$i){ $l = Utils::readTriad(substr($str, $offset, 3)); $offset += 3; $data[] = substr($str, $offset, $l); @@ -290,7 +290,7 @@ class Utils{ $secureValue = ""; $rounds = 0; $drop = 0; - while(!isset($output{$length - 1})){ + while(!isset($output[$length - 1])){ //some entropy, but works ^^ $weakEntropy = array( is_array($startEntropy) ? implode($startEntropy):$startEntropy, diff --git a/src/utils/pthreads.php b/src/utils/pthreads.php index 31006968..a9924632 100644 --- a/src/utils/pthreads.php +++ b/src/utils/pthreads.php @@ -39,7 +39,7 @@ class AsyncMultipleQueue extends Thread{ return $len; } $offset = 0; - while(!isset($str{$len - 1})){ + while(!isset($str[$len - 1])){ if(isset($this->input[$offset])){ $str .= $this->input[$offset]; ++$offset; @@ -51,7 +51,7 @@ class AsyncMultipleQueue extends Thread{ public function run(){ while($this->stop === false){ - if(isset($this->input{5})){ //len 6 min + if(isset($this->input[5])){ //len 6 min $rID = Utils::readInt($this->get(4)); switch(Utils::readShort($this->get(2), false)){ case ASYNC_CURL_GET: diff --git a/src/world/generator/object/NetherReactorStructure.php b/src/world/generator/object/NetherReactorStructure.php index 74da6e9d..7174c4ae 100644 --- a/src/world/generator/object/NetherReactorStructure.php +++ b/src/world/generator/object/NetherReactorStructure.php @@ -603,7 +603,7 @@ class NetherReactorStructure{ case " ": $block = $level->getBlock(new Vector3($x - 8 + $offsetX, $y - 1 + $layerCount, $z - 8 + $offsetZ))->getID(); if($block == 0){ - continue; + continue 2; } $level->setBlockRaw(new Vector3($x - 8 + $offsetX, $y - 1 + $layerCount, $z - 8 + $offsetZ), new AirBlock()); break;