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

Fixed Tiles/Entities not using the correct chunk type

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-30 18:24:59 +02:00
parent 765d4f30c7
commit 1a442b793c
7 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pocketmine/entity/Entity.php
View File

@ -35,6 +35,7 @@ use pocketmine\event\entity\EntitySpawnEvent;
use pocketmine\event\entity\EntityTeleportEvent; use pocketmine\event\entity\EntityTeleportEvent;
use pocketmine\event\Timings; use pocketmine\event\Timings;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\level\Position; use pocketmine\level\Position;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
@ -146,7 +147,7 @@ abstract class Entity extends Position implements Metadatable{
public $closed = false; public $closed = false;
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
if($chunk->getLevel() === null){ if($chunk->getLevel() === null){
throw new \Exception("Invalid garbage Chunk given to Entity"); throw new \Exception("Invalid garbage Chunk given to Entity");
} }
@ -932,7 +933,7 @@ abstract class Entity extends Position implements Metadatable{
if($this->chunk === null or ($this->chunk->getX() !== ($this->x >> 4) and $this->chunk->getZ() !== ($this->z >> 4))){ if($this->chunk === null or ($this->chunk->getX() !== ($this->x >> 4) and $this->chunk->getZ() !== ($this->z >> 4))){
if($this->chunk instanceof Chunk){ if($this->chunk instanceof FullChunk){
$this->chunk->removeEntity($this); $this->chunk->removeEntity($this);
} }
$this->getLevel()->loadChunk($this->x >> 4, $this->z >> 4); $this->getLevel()->loadChunk($this->x >> 4, $this->z >> 4);
@ -1040,7 +1041,7 @@ abstract class Entity extends Position implements Metadatable{
if($this->closed === false){ if($this->closed === false){
$this->closed = true; $this->closed = true;
unset(Entity::$needUpdate[$this->id]); unset(Entity::$needUpdate[$this->id]);
if($this->chunk instanceof Chunk){ if($this->chunk instanceof FullChunk){
$this->chunk->removeEntity($this); $this->chunk->removeEntity($this);
} }
$this->getLevel()->removeEntity($this); $this->getLevel()->removeEntity($this);

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

@ -37,6 +37,7 @@ use pocketmine\event\LevelTimings;
use pocketmine\event\player\PlayerInteractEvent; use pocketmine\event\player\PlayerInteractEvent;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\level\format\generic\EmptyChunkSection; use pocketmine\level\format\generic\EmptyChunkSection;
use pocketmine\level\format\LevelProvider; use pocketmine\level\format\LevelProvider;
use pocketmine\level\format\SimpleChunk; use pocketmine\level\format\SimpleChunk;
@ -1309,6 +1310,12 @@ class Level implements ChunkManager, Metadatable{
} }
$blockIds = []; $blockIds = [];
$data = []; $data = [];
if(!$this->useSections){
//TODO
return new SimpleChunk($x, $z, 0);
}
for($Y = 0; $Y < 8; ++$Y){ for($Y = 0; $Y < 8; ++$Y){
$section = $chunk->getSection($Y); $section = $chunk->getSection($Y);
$blockIds[$Y] = $section->getIdArray(); $blockIds[$Y] = $section->getIdArray();
@ -1573,13 +1580,13 @@ class Level implements ChunkManager, Metadatable{
*/ */
public function loadChunk($x, $z, $generate = true){ public function loadChunk($x, $z, $generate = true){
if($generate === true){ if($generate === true){
return $this->getChunkAt($x, $z, true) instanceof Chunk; return $this->getChunkAt($x, $z, true) instanceof FullChunk;
} }
$this->cancelUnloadChunkRequest($x, $z); $this->cancelUnloadChunkRequest($x, $z);
$chunk = $this->provider->getChunk($x, $z, false); $chunk = $this->provider->getChunk($x, $z, false);
if($chunk instanceof Chunk){ if($chunk instanceof FullChunk){
$this->chunks[Level::chunkHash($x, $z)] = $chunk; $this->chunks[Level::chunkHash($x, $z)] = $chunk;
return true; return true;
}else{ }else{
@ -1587,7 +1594,7 @@ class Level implements ChunkManager, Metadatable{
$this->provider->loadChunk($x, $z); $this->provider->loadChunk($x, $z);
$this->timings->syncChunkLoadTimer->stopTiming(); $this->timings->syncChunkLoadTimer->stopTiming();
if(($chunk = $this->provider->getChunk($x, $z)) instanceof Chunk){ if(($chunk = $this->provider->getChunk($x, $z)) instanceof FullChunk){
$this->chunks[Level::chunkHash($x, $z)] = $chunk; $this->chunks[Level::chunkHash($x, $z)] = $chunk;
return true; return true;
} }

3
src/pocketmine/tile/Chest.php
View File

@ -26,6 +26,7 @@ use pocketmine\inventory\DoubleChestInventory;
use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\math\Vector3 as Vector3; use pocketmine\math\Vector3 as Vector3;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\Byte; use pocketmine\nbt\tag\Byte;
@ -42,7 +43,7 @@ class Chest extends Spawnable implements InventoryHolder, Container{
/** @var DoubleChestInventory */ /** @var DoubleChestInventory */
protected $doubleInventory = null; protected $doubleInventory = null;
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
$nbt["id"] = Tile::CHEST; $nbt["id"] = Tile::CHEST;
parent::__construct($chunk, $nbt); parent::__construct($chunk, $nbt);
$this->inventory = new ChestInventory($this); $this->inventory = new ChestInventory($this);

3
src/pocketmine/tile/Furnace.php
View File

@ -27,6 +27,7 @@ use pocketmine\inventory\FurnaceRecipe;
use pocketmine\inventory\InventoryHolder; use pocketmine\inventory\InventoryHolder;
use pocketmine\item\Item; use pocketmine\item\Item;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\Byte; use pocketmine\nbt\tag\Byte;
use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Compound;
@ -37,7 +38,7 @@ class Furnace extends Tile implements InventoryHolder, Container{
/** @var FurnaceInventory */ /** @var FurnaceInventory */
protected $inventory; protected $inventory;
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
$nbt["id"] = Tile::FURNACE; $nbt["id"] = Tile::FURNACE;
parent::__construct($chunk, $nbt); parent::__construct($chunk, $nbt);
$this->inventory = new FurnaceInventory($this); $this->inventory = new FurnaceInventory($this);

3
src/pocketmine/tile/Sign.php
View File

@ -22,13 +22,14 @@
namespace pocketmine\tile; namespace pocketmine\tile;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Compound;
use pocketmine\nbt\tag\Int; use pocketmine\nbt\tag\Int;
use pocketmine\nbt\tag\String; use pocketmine\nbt\tag\String;
class Sign extends Spawnable{ class Sign extends Spawnable{
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
$nbt["id"] = Tile::SIGN; $nbt["id"] = Tile::SIGN;
if(!isset($nbt->Text1)){ if(!isset($nbt->Text1)){
$nbt->Text1 = new String("Text1", ""); $nbt->Text1 = new String("Text1", "");

3
src/pocketmine/tile/Spawnable.php
View File

@ -22,6 +22,7 @@
namespace pocketmine\tile; namespace pocketmine\tile;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;
use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Compound;
use pocketmine\network\protocol\EntityDataPacket; use pocketmine\network\protocol\EntityDataPacket;
@ -48,7 +49,7 @@ abstract class Spawnable extends Tile{
public abstract function getSpawnCompound(); public abstract function getSpawnCompound();
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
parent::__construct($chunk, $nbt); parent::__construct($chunk, $nbt);
$this->spawnToAll(); $this->spawnToAll();
} }

3
src/pocketmine/tile/Tile.php
View File

@ -27,6 +27,7 @@ namespace pocketmine\tile;
use pocketmine\event\Timings; use pocketmine\event\Timings;
use pocketmine\level\format\Chunk; use pocketmine\level\format\Chunk;
use pocketmine\level\format\FullChunk;
use pocketmine\level\format\LevelProvider; use pocketmine\level\format\LevelProvider;
use pocketmine\level\Position; use pocketmine\level\Position;
use pocketmine\nbt\tag\Compound; use pocketmine\nbt\tag\Compound;
@ -62,7 +63,7 @@ abstract class Tile extends Position{
/** @var \pocketmine\event\TimingsHandler */ /** @var \pocketmine\event\TimingsHandler */
public $tickTimer; public $tickTimer;
public function __construct(Chunk $chunk, Compound $nbt){ public function __construct(FullChunk $chunk, Compound $nbt){
if($chunk->getLevel() === null){ if($chunk->getLevel() === null){
throw new \Exception("Invalid garbage Chunk given to Tile"); throw new \Exception("Invalid garbage Chunk given to Tile");
} }