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

Level: use appropriate exceptions

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-01-19 14:55:09 +00:00
parent 65927e6965
commit 9d8a70d5cf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pocketmine/level/Level.php
View File

@ -2503,14 +2503,14 @@ class Level implements ChunkManager, Metadatable{
/**
* @param Entity $entity
*
* @throws LevelException
* @throws \InvalidArgumentException
*/
public function addEntity(Entity $entity){
if($entity->isClosed()){
throw new \InvalidArgumentException("Attempted to add a garbage closed Entity to Level");
}
if($entity->getLevel() !== $this){
throw new LevelException("Invalid Entity level");
throw new \InvalidArgumentException("Invalid Entity level");
}
if($entity instanceof Player){
@ -2524,11 +2524,11 @@ class Level implements ChunkManager, Metadatable{
*
* @param Entity $entity
*
* @throws LevelException
* @throws \InvalidArgumentException
*/
public function removeEntity(Entity $entity){
if($entity->getLevel() !== $this){
throw new LevelException("Invalid Entity level");
throw new \InvalidArgumentException("Invalid Entity level");
}
if($entity instanceof Player){
@ -2543,14 +2543,14 @@ class Level implements ChunkManager, Metadatable{
/**
* @param Tile $tile
*
* @throws LevelException
* @throws \InvalidArgumentException
*/
public function addTile(Tile $tile){
if($tile->isClosed()){
throw new \InvalidArgumentException("Attempted to add a garbage closed Tile to Level");
}
if($tile->getLevel() !== $this){
throw new LevelException("Invalid Tile level");
throw new \InvalidArgumentException("Invalid Tile level");
}
$chunkX = $tile->getFloorX() >> 4;
@ -2569,11 +2569,11 @@ class Level implements ChunkManager, Metadatable{
/**
* @param Tile $tile
*
* @throws LevelException
* @throws \InvalidArgumentException
*/
public function removeTile(Tile $tile){
if($tile->getLevel() !== $this){
throw new LevelException("Invalid Tile level");
throw new \InvalidArgumentException("Invalid Tile level");
}
unset($this->tiles[$blockHash = Level::blockHash($tile->x, $tile->y, $tile->z)], $this->updateTiles[$blockHash]);