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

Merge branch 'next-major' into modern-world-support

Browse Source
This commit is contained in:
Dylan K. Taylor 2022-06-06 17:33:19 +01:00
commit f08f82edfd
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/inventory/transaction/CraftingTransaction.php
View File

@ -48,8 +48,8 @@ use function intdiv;
* results, with no remainder. Any leftovers are expected to be emitted back to the crafting grid. * results, with no remainder. Any leftovers are expected to be emitted back to the crafting grid.
*/ */
class CraftingTransaction extends InventoryTransaction{ class CraftingTransaction extends InventoryTransaction{
protected ?CraftingRecipe $recipe; protected ?CraftingRecipe $recipe = null;
protected ?int $repetitions; protected ?int $repetitions = null;
/** @var Item[] */ /** @var Item[] */
protected array $inputs = []; protected array $inputs = [];

2
src/thread/CommonThreadPartsTrait.php
View File

@ -30,7 +30,7 @@ use function error_reporting;
trait CommonThreadPartsTrait{ trait CommonThreadPartsTrait{
/** @var \Threaded|\ClassLoader[]|null */ /** @var \Threaded|\ClassLoader[]|null */
private ?\Threaded $classLoaders = null; private ?\Threaded $classLoaders = null;
protected ?string $composerAutoloaderPath; protected ?string $composerAutoloaderPath = null;
protected bool $isKilled = false; protected bool $isKilled = false;

4
src/world/utils/SubChunkExplorer.php
View File

@ -28,8 +28,8 @@ use pocketmine\world\format\Chunk;
use pocketmine\world\format\SubChunk; use pocketmine\world\format\SubChunk;
class SubChunkExplorer{ class SubChunkExplorer{
public ?Chunk $currentChunk; public ?Chunk $currentChunk = null;
public ?SubChunk $currentSubChunk; public ?SubChunk $currentSubChunk = null;
protected int $currentX; protected int $currentX;
protected int $currentY; protected int $currentY;