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

Removed some remaining references, removed duplicated code on Anvil

Browse Source
This commit is contained in:
Shoghi Cervantes 2015-04-19 16:45:45 +02:00
parent 897774f848
commit 6ed63edd89
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89
7 changed files with 13 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -581,7 +581,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
}
}
public function sendChunk($x, $z, &$payload){
public function sendChunk($x, $z, $payload){
if($this->connected === false){
return;
}

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

@ -1993,11 +1993,11 @@ class Level implements ChunkManager, Metadatable{
}
}
public function chunkRequestCallback($x, $z, &$payload){
public function chunkRequestCallback($x, $z, $payload){
$index = Level::chunkHash($x, $z);
if(!isset($this->chunkCache[$index]) and $this->cacheChunks and $this->server->getMemoryManager()->canUseChunkCache()){
$this->chunkCache[$index] =& $payload;
$this->chunkCache[$index] = $payload;
}
if(isset($this->chunkSendTasks[$index])){

61
src/pocketmine/level/format/anvil/RegionLoader.php
View File

@ -54,65 +54,8 @@ class RegionLoader extends \pocketmine\level\format\mcregion\RegionLoader{
$this->lastUsed = time();
}
public function readChunk($x, $z, $generate = true, $forward = false){
$index = self::getChunkOffset($x, $z);
if($index < 0 or $index >= 4096){
return null;
}
$this->lastUsed = time();
if(!$this->isChunkGenerated($index)){
if($generate === true){
//Allocate space
$this->locationTable[$index][0] = ++$this->lastSector;
$this->locationTable[$index][1] = 1;
fseek($this->filePointer, $this->locationTable[$index][0] << 12);
fwrite($this->filePointer, str_pad(Binary::writeInt(-1) . chr(self::COMPRESSION_ZLIB), 4096, "\x00", STR_PAD_RIGHT));
$this->writeLocationIndex($index);
}else{
return null;
}
}
fseek($this->filePointer, $this->locationTable[$index][0] << 12);
$length = Binary::readInt(fread($this->filePointer, 4));
$compression = ord(fgetc($this->filePointer));
if($length <= 0 or $length >= self::MAX_SECTOR_LENGTH){ //Not yet generated / corrupted
if($length >= self::MAX_SECTOR_LENGTH){
$this->locationTable[$index][0] = ++$this->lastSector;
$this->locationTable[$index][1] = 1;
MainLogger::getLogger()->error("Corrupted chunk header detected");
}
$this->generateChunk($x, $z);
fseek($this->filePointer, $this->locationTable[$index][0] << 12);
$length = Binary::readInt(fread($this->filePointer, 4));
$compression = ord(fgetc($this->filePointer));
}
if($length > ($this->locationTable[$index][1] << 12)){ //Invalid chunk, bigger than defined number of sectors
MainLogger::getLogger()->error("Corrupted bigger chunk detected");
$this->locationTable[$index][1] = $length >> 12;
$this->writeLocationIndex($index);
}elseif($compression !== self::COMPRESSION_ZLIB and $compression !== self::COMPRESSION_GZIP){
MainLogger::getLogger()->error("Invalid compression type");
return null;
}
$data = fread($this->filePointer, $length - 1);
$chunk = Chunk::fromBinary($data, $this->levelProvider);
if($chunk instanceof Chunk){
return $chunk;
}elseif($forward === false){
MainLogger::getLogger()->error("Corrupted chunk detected");
$this->generateChunk($x, $z);
return $this->readChunk($x, $z, $generate, true);
}else{
return null;
}
protected function unserializeChunk($data){
return Chunk::fromBinary($data, $this->levelProvider);
}
public function generateChunk($x, $z){

3
src/pocketmine/level/format/mcregion/Chunk.php
View File

@ -344,7 +344,7 @@ class Chunk extends BaseFullChunk{
$biomeColors = pack("N*", ...$this->getBiomeColorArray());
$heightMap = pack("N*", ...$this->getHeightMapArray());
$data =
return
Binary::writeInt($this->x) .
Binary::writeInt($this->z) .
$this->getBlockIdArray() .
@ -355,7 +355,6 @@ class Chunk extends BaseFullChunk{
$biomeColors .
$heightMap .
chr(($this->isPopulated() ? 1 << 1 : 0) + ($this->isGenerated() ? 1 : 0));
return $data;
}
public function toBinary(){

7
src/pocketmine/level/format/mcregion/RegionLoader.php
View File

@ -130,8 +130,7 @@ class RegionLoader{
return null;
}
$data = fread($this->filePointer, $length - 1);
$chunk = Chunk::fromBinary($data, $this->levelProvider);
$chunk = $this->unserializeChunk(fread($this->filePointer, $length - 1));
if($chunk instanceof Chunk){
return $chunk;
}elseif($forward === false){
@ -144,6 +143,10 @@ class RegionLoader{
}
}
protected function unserializeChunk($data){
return Chunk::fromBinary($data, $this->levelProvider);
}
public function chunkExists($x, $z){
return $this->isChunkGenerated(self::getChunkOffset($x, $z));
}

3
src/pocketmine/nbt/tag/IntArray.php
View File

@ -42,7 +42,6 @@ class IntArray extends NamedTag{
public function write(NBT $nbt){
$nbt->putInt(count($this->value));
$data = pack($nbt->endianness === NBT::LITTLE_ENDIAN ? "V*" : "N*", ...$this->value);
$nbt->put($data);
$nbt->put(pack($nbt->endianness === NBT::LITTLE_ENDIAN ? "V*" : "N*", ...$this->value));
}
}

7
src/pocketmine/nbt/tag/String.php
View File

@ -27,13 +27,6 @@ use pocketmine\nbt\NBT;
class String extends NamedTag{
public function __construct($name = "", $value = null){
$this->name = $name;
if($value !== null){
$this->value = $value;
}
}
public function getType(){
return NBT::TAG_String;
}