mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-07-03 00:29:54 +00:00
Separate TickingChunkLoader from ChunkLoader
this makes it possible to keep chunks loaded without ticking them.
This commit is contained in:
parent
d1387ebd0a
commit
c092a2e836
@ -774,6 +774,9 @@ This version features substantial changes to the network system, improving coher
|
|||||||
- `BlockTransaction`: allows creating batch commits of block changes with validation conditions - if any block can't be applied, the whole transaction fails to apply.
|
- `BlockTransaction`: allows creating batch commits of block changes with validation conditions - if any block can't be applied, the whole transaction fails to apply.
|
||||||
- `ChunkListenerNoOpTrait`: contains default no-op stubs for chunk listener implementations
|
- `ChunkListenerNoOpTrait`: contains default no-op stubs for chunk listener implementations
|
||||||
- `ChunkListener`: interface allowing subscribing to events happening on a given chunk
|
- `ChunkListener`: interface allowing subscribing to events happening on a given chunk
|
||||||
|
- `TickingChunkLoader`: a `ChunkLoader` specialization that allows ticking chunks
|
||||||
|
- `ChunkLoader` no longer requires implementing `getX()` and `getZ()`.
|
||||||
|
- `ChunkLoader` no longer causes chunks to get random updates. If this behaviour is needed, implement `TickingChunkLoader`.
|
||||||
- The following classes have been renamed:
|
- The following classes have been renamed:
|
||||||
- `pocketmine\world\utils\SubChunkIteratorManager` -> `pocketmine\world\utils\SubChunkExplorer`
|
- `pocketmine\world\utils\SubChunkIteratorManager` -> `pocketmine\world\utils\SubChunkExplorer`
|
||||||
- The following API methods have been added:
|
- The following API methods have been added:
|
||||||
|
@ -211,7 +211,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
|
|||||||
protected $chunksPerTick;
|
protected $chunksPerTick;
|
||||||
/** @var ChunkSelector */
|
/** @var ChunkSelector */
|
||||||
protected $chunkSelector;
|
protected $chunkSelector;
|
||||||
/** @var TickingChunkLoader */
|
/** @var PlayerChunkLoader */
|
||||||
protected $chunkLoader;
|
protected $chunkLoader;
|
||||||
|
|
||||||
/** @var bool[] map: raw UUID (string) => bool */
|
/** @var bool[] map: raw UUID (string) => bool */
|
||||||
@ -295,7 +295,7 @@ class Player extends Human implements CommandSender, ChunkListener, IPlayer{
|
|||||||
$onGround = true;
|
$onGround = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->chunkLoader = new TickingChunkLoader($spawn);
|
$this->chunkLoader = new PlayerChunkLoader($spawn);
|
||||||
|
|
||||||
//load the spawn chunk so we can see the terrain
|
//load the spawn chunk so we can see the terrain
|
||||||
$world->registerChunkLoader($this->chunkLoader, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4, true);
|
$world->registerChunkLoader($this->chunkLoader, $spawn->getFloorX() >> 4, $spawn->getFloorZ() >> 4, true);
|
||||||
|
@ -24,9 +24,9 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\player;
|
namespace pocketmine\player;
|
||||||
|
|
||||||
use pocketmine\math\Vector3;
|
use pocketmine\math\Vector3;
|
||||||
use pocketmine\world\ChunkLoader;
|
use pocketmine\world\TickingChunkLoader;
|
||||||
|
|
||||||
final class TickingChunkLoader implements ChunkLoader{
|
final class PlayerChunkLoader implements TickingChunkLoader{
|
||||||
|
|
||||||
/** @var Vector3 */
|
/** @var Vector3 */
|
||||||
private $currentLocation;
|
private $currentLocation;
|
@ -24,7 +24,7 @@ declare(strict_types=1);
|
|||||||
namespace pocketmine\world;
|
namespace pocketmine\world;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If you want to keep chunks loaded, implement this interface and register it into World. This will also tick chunks.
|
* If you want to keep chunks loaded, implement this interface and register it into World.
|
||||||
*
|
*
|
||||||
* @see World::registerChunkLoader()
|
* @see World::registerChunkLoader()
|
||||||
* @see World::unregisterChunkLoader()
|
* @see World::unregisterChunkLoader()
|
||||||
@ -34,13 +34,4 @@ namespace pocketmine\world;
|
|||||||
*/
|
*/
|
||||||
interface ChunkLoader{
|
interface ChunkLoader{
|
||||||
|
|
||||||
/**
|
|
||||||
* @return float
|
|
||||||
*/
|
|
||||||
public function getX();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return float
|
|
||||||
*/
|
|
||||||
public function getZ();
|
|
||||||
}
|
}
|
||||||
|
42
src/world/TickingChunkLoader.php
Normal file
42
src/world/TickingChunkLoader.php
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* ____ _ _ __ __ _ __ __ ____
|
||||||
|
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
|
||||||
|
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
|
||||||
|
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
|
||||||
|
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* @author PocketMine Team
|
||||||
|
* @link http://www.pocketmine.net/
|
||||||
|
*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace pocketmine\world;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* TickingChunkLoader includes all of the same functionality as ChunkLoader (it can be used in the same way).
|
||||||
|
* However, using this version will also cause chunks around the loader's reported coordinates to get random block
|
||||||
|
* updates.
|
||||||
|
*/
|
||||||
|
interface TickingChunkLoader extends ChunkLoader{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return float
|
||||||
|
*/
|
||||||
|
public function getX();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return float
|
||||||
|
*/
|
||||||
|
public function getZ();
|
||||||
|
}
|
@ -951,6 +951,10 @@ class World implements ChunkManager{
|
|||||||
$randRange = (int) ($randRange > $this->chunkTickRadius ? $this->chunkTickRadius : $randRange);
|
$randRange = (int) ($randRange > $this->chunkTickRadius ? $this->chunkTickRadius : $randRange);
|
||||||
|
|
||||||
foreach($this->loaders as $loader){
|
foreach($this->loaders as $loader){
|
||||||
|
if(!($loader instanceof TickingChunkLoader)){
|
||||||
|
//TODO: maybe we should just not track non-ticking chunk loaders here?
|
||||||
|
continue;
|
||||||
|
}
|
||||||
$chunkX = (int) floor($loader->getX()) >> 4;
|
$chunkX = (int) floor($loader->getX()) >> 4;
|
||||||
$chunkZ = (int) floor($loader->getZ()) >> 4;
|
$chunkZ = (int) floor($loader->getZ()) >> 4;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user