From 6d89c50e4393896d93095f9a54c25e868d6073f3 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Mon, 3 Jul 2023 07:10:04 +0300 Subject: [PATCH] php8.2 fixes --- src/API/ConsoleAPI.php | 2 +- src/API/EntityAPI.php | 2 +- src/API/ServerAPI.php | 5 +++ src/PocketMinecraftServer.php | 2 +- src/entity/Entity.php | 2 +- src/network/MinecraftInterface.php | 2 +- src/network/UDPSocket.php | 2 +- src/network/raknet/RakNetCodec.php | 2 +- src/pmf/PMFLevel.php | 1 + src/utils/Random.php | 1 + src/world/Level.php | 4 +-- src/world/generator/ExperimentalGenerator.php | 32 +++++++++---------- src/world/generator/WorldGenerator.php | 2 +- 13 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/API/ConsoleAPI.php b/src/API/ConsoleAPI.php index 8aea33c5..e05876c2 100644 --- a/src/API/ConsoleAPI.php +++ b/src/API/ConsoleAPI.php @@ -3,7 +3,7 @@ class ConsoleAPI{ private $loop, $server, $event, $help, $cmds, $alias; - + public $last; function __construct(){ $this->help = []; $this->cmds = []; diff --git a/src/API/EntityAPI.php b/src/API/EntityAPI.php index b75dbcb1..efc7965c 100644 --- a/src/API/EntityAPI.php +++ b/src/API/EntityAPI.php @@ -4,7 +4,7 @@ class EntityAPI{ public $entities; private $server; private $eCnt = 1; - + public $serverSpawnAnimals, $serverSpawnMobs; function __construct(){ $this->entities = []; $this->server = ServerAPI::request(); diff --git a/src/API/ServerAPI.php b/src/API/ServerAPI.php index 91180f91..805eddaf 100644 --- a/src/API/ServerAPI.php +++ b/src/API/ServerAPI.php @@ -57,6 +57,11 @@ class ServerAPI{ */ public $plugin; + /** + * @var QueryHandler + */ + public $query; + private $asyncCalls = []; private $server; private $config; diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 3d6c1164..03c36eb9 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -9,7 +9,7 @@ class PocketMinecraftServer{ */ public $api; private $serverip, $evCnt, $handCnt, $events, $eventsID, $handlers, $serverType, $lastTick, $memoryStats, $async = [], $asyncID = 0; - + public $levelData, $doTick, $difficulty, $tiles, $entities, $schedule, $scheduleCnt, $whitelist, $spawn, $asyncThread, $stop; function __construct($name, $gamemode = SURVIVAL, $seed = false, $port = 19132, $serverip = "0.0.0.0"){ $this->port = (int) $port; $this->doTick = true; diff --git a/src/entity/Entity.php b/src/entity/Entity.php index e4e1f7e2..2ec83f18 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -7,7 +7,7 @@ class Entity extends Position const CLASS_TYPE = - 1; public $counter = 0; - + public $invincible, $status, $health, $fire, $crouched, $position, $meta, $stack; public static $updateOnTick, $allowedAI; public $isCollidable; public $canBeAttacked; diff --git a/src/network/MinecraftInterface.php b/src/network/MinecraftInterface.php index 38450b18..11db0660 100644 --- a/src/network/MinecraftInterface.php +++ b/src/network/MinecraftInterface.php @@ -5,7 +5,7 @@ class MinecraftInterface{ public $bandwidth; private $socket; private $packets; - + public $start, $stop; function __construct($server, $port = 25565, $serverip = "0.0.0.0"){ $this->socket = new UDPSocket($server, $port, true, $serverip); if($this->socket->connected === false){ diff --git a/src/network/UDPSocket.php b/src/network/UDPSocket.php index 6a3263d0..c8291bd9 100644 --- a/src/network/UDPSocket.php +++ b/src/network/UDPSocket.php @@ -3,7 +3,7 @@ class UDPSocket{ public $connected, $sock, $server; - + public $port; function __construct($server, $port, $listen = false, $serverip = "0.0.0.0"){ $this->server = $server; $this->port = $port; diff --git a/src/network/raknet/RakNetCodec.php b/src/network/raknet/RakNetCodec.php index 6b2313b8..34393bc6 100644 --- a/src/network/raknet/RakNetCodec.php +++ b/src/network/raknet/RakNetCodec.php @@ -3,7 +3,7 @@ class RakNetCodec{ public $packet; - + public $buffer; public function __construct(RakNetPacket $packet){ $this->packet = $packet; $this->buffer = &$this->packet->buffer; diff --git a/src/pmf/PMFLevel.php b/src/pmf/PMFLevel.php index f49f959a..86e26c90 100644 --- a/src/pmf/PMFLevel.php +++ b/src/pmf/PMFLevel.php @@ -5,6 +5,7 @@ define("PMF_CURRENT_LEVEL_VERSION", 0x01); class PMFLevel extends PMF{ public $isLoaded = true; + public $level; public $levelData = []; private $locationTable = []; private $log = 4; diff --git a/src/utils/Random.php b/src/utils/Random.php index 72320fc0..567a92d3 100644 --- a/src/utils/Random.php +++ b/src/utils/Random.php @@ -4,6 +4,7 @@ class Random{ public $x, $y, $z, $w; + public $i, $j, $state; public $haveNextNextGaussian = false; public $nextNextGaussian = 0; diff --git a/src/world/Level.php b/src/world/Level.php index d9f1bc5b..bfcecdf2 100644 --- a/src/world/Level.php +++ b/src/world/Level.php @@ -18,7 +18,7 @@ class Level{ * @var Entity[] */ public $entityList; - public $tiles, $blockUpdates, $nextSave, $players = [], $level; + public $tiles, $blockUpdates, $nextSave, $players = [], $level, $mobSpawner; private $time, $startCheck, $startTime, $server, $name, $usedChunks, $changedBlocks, $changedCount, $stopTime; private $generator; @@ -397,7 +397,7 @@ class Level{ foreach($eids as $cid => $_){ $p = $this->server->clients[$cid] ?? false; if($p instanceof Player){ - $dist = abs($xz[0] - ($p->entity->x >> 4)) + abs($xz[1] - ($p->entity->z >> 4)); + $dist = abs($xz[0] - (((int)$p->entity->x) >> 4)) + abs($xz[1] - (((int)$p->entity->z) >> 4)); if($dist > 8){ //ConsoleAPI::debug("{$p->player} freeing chunk: {$xz[0]} {$xz[1]}"); $this->freeChunk($xz[0], $xz[1], $p); diff --git a/src/world/generator/ExperimentalGenerator.php b/src/world/generator/ExperimentalGenerator.php index 8a25efb3..e1fc316e 100644 --- a/src/world/generator/ExperimentalGenerator.php +++ b/src/world/generator/ExperimentalGenerator.php @@ -10,28 +10,28 @@ class ExperimentalGenerator implements NewLevelGenerator{ /** * @var Populator[] */ - private $populators = array(); + public $populators = array(); /** * @var Populator[] */ - private $genPopulators = array(); - private $level; - private $random; - private $waterHeight = 63; - private $noiseHills; - private $noisePatches; - private $noisePatchesSmall; - private $noiseBase; + public $genPopulators = array(); + public $level; + public $random; + public $waterHeight = 63; + public $noiseHills; + public $noisePatches; + public $noisePatchesSmall; + public $noiseBase; + public $selector; - - private static $GAUSSIAN_KERNEL = null; - private static $SMOOTH_SIZE = 2; + public static $GAUSSIAN_KERNEL = null; + public static $SMOOTH_SIZE = 2; public function __construct(array $options = array()){ ExperimentalGenerator::generateKernel(); } - private static function generateKernel(){ + public static function generateKernel(){ ExperimentalGenerator::$GAUSSIAN_KERNEL = []; $bellSize = 1 / ExperimentalGenerator::$SMOOTH_SIZE; @@ -88,10 +88,10 @@ class ExperimentalGenerator implements NewLevelGenerator{ } public function pickBiome($x, $z){ - $hash = $x * 2345803 ^ $z * 9236449 ^ $this->level->level->getSeed(); + $hash = (int) ($x * 2345803 ^ $z * 9236449 ^ $this->level->level->getSeed()); $hash *= $hash + 223; - $xNoise = $hash >> 20 & 3; - $zNoise = $hash >> 22 & 3; + $xNoise = ((int)$hash) >> 20 & 3; + $zNoise = ((int)$hash) >> 22 & 3; if($xNoise == 3){ $xNoise = 1; } diff --git a/src/world/generator/WorldGenerator.php b/src/world/generator/WorldGenerator.php index 5d8a5583..84c11742 100644 --- a/src/world/generator/WorldGenerator.php +++ b/src/world/generator/WorldGenerator.php @@ -2,7 +2,7 @@ class WorldGenerator{ - private $seed, $level, $path, $random, $generator, $width; + private $seed, $level, $path, $random, $generator, $width, $height; public function __construct(LevelGenerator $generator, $name, $seed = false, $width = 16, $height = 8){ $this->seed = $seed !== false ? (int) $seed : Utils::readInt(Utils::getRandomBytes(4, false));