mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-20 07:39:42 +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-02 20:24:25 +01:00
parent ef15dc883a 23695fb900
commit 01af70f671
26 changed files with 299 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/world/Position.php
View File

@@ -28,16 +28,9 @@ use pocketmine\utils\AssumptionFailedError;
use function assert;
class Position extends Vector3{
public ?World $world = null;
/** @var World|null */
public $world = null;
/**
* @param float|int $x
* @param float|int $y
* @param float|int $z
*/
public function __construct($x, $y, $z, ?World $world){
public function __construct(float|int $x, float|int $y, float|int $z, ?World $world){
parent::__construct($x, $y, $z);
if($world !== null && !$world->isLoaded()){
throw new \InvalidArgumentException("Specified world has been unloaded and cannot be used");

8
src/world/World.php
View File

@@ -1904,11 +1904,9 @@ class World implements ChunkManager{
public function getCollidingEntities(AxisAlignedBB $bb, ?Entity $entity = null) : array{
$nearby = [];
if($entity === null || $entity->canCollide){
foreach($this->getNearbyEntities($bb, $entity) as $ent){
if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){
$nearby[] = $ent;
}
foreach($this->getNearbyEntities($bb, $entity) as $ent){
if($ent->canBeCollidedWith() && ($entity === null || $entity->canCollideWith($ent))){
$nearby[] = $ent;
}
}

3
src/world/format/io/region/RegionLoader.php
View File

@@ -64,9 +64,6 @@ class RegionLoader{
public const FIRST_SECTOR = 2; //location table occupies 0 and 1
/** @var int */
public static $COMPRESSION_LEVEL = 7;
/** @var string */
protected $filePath;
/** @var resource */