mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-23 03:16:35 +00:00
Code Issues Projects Releases Wiki Activity

Timezone: Apparently timezone_id returned by timezone_abbreviations_list() may be null...

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-11-12 14:40:19 +00:00
parent ef100b248b
commit d5e3636908
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/player/Player.php
View File

@ -300,14 +300,6 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
$this->chunkLoader = new PlayerChunkLoader($spawnLocation); $this->chunkLoader = new PlayerChunkLoader($spawnLocation);
$world = $spawnLocation->getWorld();
//load the spawn chunk so we can see the terrain
$xSpawnChunk = $spawnLocation->getFloorX() >> Chunk::COORD_BIT_SIZE;
$zSpawnChunk = $spawnLocation->getFloorZ() >> Chunk::COORD_BIT_SIZE;
$world->registerChunkLoader($this->chunkLoader, $xSpawnChunk, $zSpawnChunk, true);
$world->registerChunkListener($this, $xSpawnChunk, $zSpawnChunk);
$this->usedChunks[World::chunkHash($xSpawnChunk, $zSpawnChunk)] = UsedChunkStatus::NEEDED();
parent::__construct($spawnLocation, $this->playerInfo->getSkin(), $namedtag); parent::__construct($spawnLocation, $this->playerInfo->getSkin(), $namedtag);
} }

2
src/utils/Timezone.php
View File

@ -208,7 +208,7 @@ abstract class Timezone{
//That's been a bug in PHP since 2008! //That's been a bug in PHP since 2008!
foreach(timezone_abbreviations_list() as $zones){ foreach(timezone_abbreviations_list() as $zones){
foreach($zones as $timezone){ foreach($zones as $timezone){
if($timezone['offset'] == $offset){ if($timezone['timezone_id'] !== null && $timezone['offset'] == $offset){
return $timezone['timezone_id']; return $timezone['timezone_id'];
} }
} }