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

World: don't assume that random Vector3 are int vectors

Browse Source 
we can safely assume this for blocks (though the type info doesn't reflect it) but this is not safe to assume for random APIs that might be used by plugins.
This commit is contained in:
Dylan K. Taylor 2023-11-06 17:15:17 +00:00
parent bbe66e8e09
commit d09af2e30d
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block/utils/CropGrowthHelper.php
View File

@ -109,7 +109,7 @@ final class CropGrowthHelper{
$world = $position->getWorld(); $world = $position->getWorld();
//crop growth is not affected by time of day since 1.11 or so //crop growth is not affected by time of day since 1.11 or so
return $world->getPotentialLight($position) >= $minLevel; return $world->getPotentialLightAt($position->x, $position->y, $position->z) >= $minLevel;
} }
public static function canGrow(Block $block) : bool{ public static function canGrow(Block $block) : bool{

10
src/world/World.php
View File

@ -1670,7 +1670,10 @@ class World implements ChunkManager{
* time of day. * time of day.
*/ */
public function getFullLight(Vector3 $pos) : int{ public function getFullLight(Vector3 $pos) : int{
return $this->getFullLightAt($pos->x, $pos->y, $pos->z); $floorX = $pos->getFloorX();
$floorY = $pos->getFloorY();
$floorZ = $pos->getFloorZ();
return $this->getFullLightAt($floorX, $floorY, $floorZ);
} }
/** /**
@ -1699,7 +1702,10 @@ class World implements ChunkManager{
* This is not affected by weather or time of day. * This is not affected by weather or time of day.
*/ */
public function getPotentialLight(Vector3 $pos) : int{ public function getPotentialLight(Vector3 $pos) : int{
return $this->getPotentialLightAt($pos->x, $pos->y, $pos->z); $floorX = $pos->getFloorX();
$floorY = $pos->getFloorY();
$floorZ = $pos->getFloorZ();
return $this->getPotentialLightAt($floorX, $floorY, $floorZ);
} }
/** /**

30
tests/phpstan/configs/actual-problems.neon
View File

@ -425,6 +425,21 @@ parameters:
count: 3 count: 3
path: ../../../src/block/tile/Spawnable.php path: ../../../src/block/tile/Spawnable.php
-
message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/block/utils/CropGrowthHelper.php
-
message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/block/utils/CropGrowthHelper.php
-
message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getPotentialLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/block/utils/CropGrowthHelper.php
- -
message: "#^Cannot call method addParticle\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#" message: "#^Cannot call method addParticle\\(\\) on pocketmine\\\\world\\\\World\\|null\\.$#"
count: 1 count: 1
@ -910,11 +925,6 @@ parameters:
count: 1 count: 1
path: ../../../src/world/World.php path: ../../../src/world/World.php
-
message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/world/World.php
- -
message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#" message: "#^Parameter \\#1 \\$x of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
count: 1 count: 1
@ -940,11 +950,6 @@ parameters:
count: 1 count: 1
path: ../../../src/world/World.php path: ../../../src/world/World.php
-
message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/world/World.php
- -
message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#" message: "#^Parameter \\#2 \\$y of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
count: 1 count: 1
@ -975,11 +980,6 @@ parameters:
count: 1 count: 1
path: ../../../src/world/World.php path: ../../../src/world/World.php
-
message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getFullLightAt\\(\\) expects int, float\\|int given\\.$#"
count: 1
path: ../../../src/world/World.php
- -
message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#" message: "#^Parameter \\#3 \\$z of method pocketmine\\\\world\\\\World\\:\\:getTileAt\\(\\) expects int, float\\|int given\\.$#"
count: 1 count: 1