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

Eradicate remaining usages of public Position->world field

Browse Source 
and as an added bonus, ditch a bunch of extra phpstan errors
This commit is contained in:
Dylan K. Taylor 2020-05-19 19:14:56 +01:00
parent 8a8b1b0b97
commit 337addf1de
4 changed files with 4 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block/tile/ContainerTrait.php
View File

@ -96,7 +96,7 @@ trait ContainerTrait{
$pos = $this->getPos();
foreach($inv->getContents() as $k => $item){
$pos->world->dropItem($pos->add(0.5, 0.5, 0.5), $item);
$pos->getWorldNonNull()->dropItem($pos->add(0.5, 0.5, 0.5), $item);
}
$inv->clearAll();
}

4
src/block/utils/FallableTrait.php
View File

@ -47,9 +47,9 @@ trait FallableTrait{
public function onNearbyBlockChange() : void{
$pos = $this->getPos();
$down = $pos->world->getBlock($pos->getSide(Facing::DOWN));
$down = $pos->getWorldNonNull()->getBlock($pos->getSide(Facing::DOWN));
if($down->getId() === BlockLegacyIds::AIR or $down instanceof Liquid or $down instanceof Fire){
$pos->world->setBlock($pos, VanillaBlocks::AIR());
$pos->getWorldNonNull()->setBlock($pos, VanillaBlocks::AIR());
$nbt = EntityFactory::createBaseNBT($pos->add(0.5, 0, 0.5));
$nbt->setInt("TileID", $this->getId());

2
src/entity/Entity.php
View File

@ -1337,7 +1337,7 @@ abstract class Entity{
return false;
}
if($pos instanceof Position and $pos->world !== null and $pos->world !== $this->getWorld()){
if($pos instanceof Position and $pos->isValid() and $pos->getWorldNonNull() !== $this->getWorld()){
if(!$this->switchWorld($pos->getWorldNonNull())){
return false;
}

80
tests/phpstan/configs/l8-baseline.neon
View File

@ -65,106 +65,26 @@ parameters:
count: 1
path: ../../../src/block/tile/Chest.php
-
message: "#^Cannot call method dropItem\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/tile/Chest.php
-
message: "#^Argument of an invalid type pocketmine\\\\nbt\\\\tag\\\\ListTag\\|null supplied for foreach, only iterables are supported\\.$#"
count: 1
path: ../../../src/block/tile/BrewingStand.php
-
message: "#^Cannot call method dropItem\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/tile/BrewingStand.php
-
message: "#^Argument of an invalid type pocketmine\\\\nbt\\\\tag\\\\ListTag\\|null supplied for foreach, only iterables are supported\\.$#"
count: 1
path: ../../../src/block/tile/Furnace.php
-
message: "#^Cannot call method dropItem\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/tile/Furnace.php
-
message: "#^Argument of an invalid type pocketmine\\\\nbt\\\\tag\\\\ListTag\\|null supplied for foreach, only iterables are supported\\.$#"
count: 1
path: ../../../src/block/tile/Hopper.php
-
message: "#^Cannot call method dropItem\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/tile/Hopper.php
-
message: "#^Parameter \\#1 \\$nbt of method pocketmine\\\\block\\\\tile\\\\Tile\\:\\:readSaveData\\(\\) expects pocketmine\\\\nbt\\\\tag\\\\CompoundTag, pocketmine\\\\nbt\\\\tag\\\\CompoundTag\\|null given\\.$#"
count: 1
path: ../../../src/block/tile/Tile.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Anvil.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Anvil.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/ConcretePowder.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/ConcretePowder.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/DragonEgg.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/DragonEgg.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Gravel.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Gravel.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Sand.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/Sand.php
-
message: "#^Cannot call method getBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/SnowLayer.php
-
message: "#^Cannot call method setBlock\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1
path: ../../../src/block/SnowLayer.php
-
message: "#^Parameter \\#2 \\$replace of function str_replace expects array\\|string, string\\|null given\\.$#"
count: 1