diff --git a/src/block/Block.php b/src/block/Block.php
index 88bb8e64e..d17380702 100644
--- a/src/block/Block.php
+++ b/src/block/Block.php
@@ -163,7 +163,7 @@ class Block{
 			}
 		}
 		if($oldTile === null and $tileType !== null){
-			$this->pos->getWorldNonNull()->addTile(TileFactory::getInstance()->create($tileType, $this->pos->getWorld(), $this->pos->asVector3()));
+			$this->pos->getWorldNonNull()->addTile(TileFactory::getInstance()->create($tileType, $this->pos->getWorldNonNull(), $this->pos->asVector3()));
 		}
 	}
 
diff --git a/src/entity/Entity.php b/src/entity/Entity.php
index 6a9923830..01b01c2da 100644
--- a/src/entity/Entity.php
+++ b/src/entity/Entity.php
@@ -1329,7 +1329,7 @@ abstract class Entity{
 	}
 
 	public function getWorld() : World{
-		return $this->location->getWorld();
+		return $this->location->getWorldNonNull();
 	}
 
 	protected function setPosition(Vector3 $pos) : bool{
diff --git a/src/network/mcpe/NetworkSession.php b/src/network/mcpe/NetworkSession.php
index ce295a065..d5439a0a3 100644
--- a/src/network/mcpe/NetworkSession.php
+++ b/src/network/mcpe/NetworkSession.php
@@ -805,8 +805,7 @@ class NetworkSession{
 	public function startUsingChunk(int $chunkX, int $chunkZ, \Closure $onCompletion) : void{
 		Utils::validateCallableSignature(function(int $chunkX, int $chunkZ) : void{}, $onCompletion);
 
-		$world = $this->player->getLocation()->getWorld();
-		assert($world !== null);
+		$world = $this->player->getLocation()->getWorldNonNull();
 		ChunkCache::getInstance($world, $this->compressor)->request($chunkX, $chunkZ)->onResolve(
 
 			//this callback may be called synchronously or asynchronously, depending on whether the promise is resolved yet
@@ -814,7 +813,7 @@ class NetworkSession{
 				if(!$this->isConnected()){
 					return;
 				}
-				$currentWorld = $this->player->getLocation()->getWorld();
+				$currentWorld = $this->player->getLocation()->getWorldNonNull();
 				if($world !== $currentWorld or !$this->player->isUsingChunk($chunkX, $chunkZ)){
 					$this->logger->debug("Tried to send no-longer-active chunk $chunkX $chunkZ in world " . $world->getFolderName());
 					return;
diff --git a/tests/phpstan/configs/l8-baseline.neon b/tests/phpstan/configs/l8-baseline.neon
index 84cf6b1c8..be9bde78f 100644
--- a/tests/phpstan/configs/l8-baseline.neon
+++ b/tests/phpstan/configs/l8-baseline.neon
@@ -25,11 +25,6 @@ parameters:
 			count: 1
 			path: ../../../src/block/Block.php
 
-		-
-			message: "#^Parameter \\#2 \\$world of method pocketmine\\\\block\\\\tile\\\\TileFactory\\:\\:create\\(\\) expects pocketmine\\\\world\\\\World, pocketmine\\\\world\\\\World\\|null given\\.$#"
-			count: 1
-			path: ../../../src/block/Block.php
-
 		-
 			message: "#^Parameter \\#2 \\$item of method pocketmine\\\\world\\\\World\\:\\:dropItem\\(\\) expects pocketmine\\\\item\\\\Item, pocketmine\\\\item\\\\Item\\|null given\\.$#"
 			count: 1
@@ -185,11 +180,6 @@ parameters:
 			count: 1
 			path: ../../../src/entity/Entity.php
 
-		-
-			message: "#^Method pocketmine\\\\entity\\\\Entity\\:\\:getWorld\\(\\) should return pocketmine\\\\world\\\\World but returns pocketmine\\\\world\\\\World\\|null\\.$#"
-			count: 1
-			path: ../../../src/entity/Entity.php
-
 		-
 			message: "#^Property pocketmine\\\\network\\\\mcpe\\\\protocol\\\\AddActorPacket\\:\\:\\$type \\(string\\) does not accept string\\|null\\.$#"
 			count: 1