mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 10:22:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #1826 Block damage values were swapped in McRegion

Browse Source
This commit is contained in:
Shoghi Cervantes
2014-08-10 12:27:49 +02:00
parent 3495c79c0c
commit c43431c921
4 changed files with 20 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,9 +98,9 @@ class Chunk extends BaseFullChunk{
public function getBlockData($x, $y, $z){
$m = ord($this->data{($x << 10) + ($z << 6) + ($y >> 1)});
if(($y & 1) === 0){
return $m >> 4;
}else{
return $m & 0x0F;
}else{
return $m >> 4;
}
}
@ -108,9 +108,9 @@ class Chunk extends BaseFullChunk{
$i = ($x << 10) + ($z << 6) + ($y >> 1);
$old_m = ord($this->data{$i});
if(($y & 1) === 0){
$this->data{$i} = chr((($data & 0x0f) << 4) | ($old_m & 0x0f));
}else{
$this->data{$i} = chr(($old_m & 0xf0) | ($data & 0x0f));
}else{
$this->data{$i} = chr((($data & 0x0f) << 4) | ($old_m & 0x0f));
}
}
@ -119,9 +119,9 @@ class Chunk extends BaseFullChunk{
$blockId = ord($this->blocks{$i});
$m = ord($this->data{$i >> 1});
if(($y & 1) === 0){
$meta = $m >> 4;
}else{
$meta = $m & 0x0F;
}else{
$meta = $m >> 4;
}
}
@ -142,13 +142,13 @@ class Chunk extends BaseFullChunk{
$i >>= 1;
$old_m = ord($this->data{$i});
if(($y & 1) === 0){
$this->data{$i} = chr((($meta & 0x0f) << 4) | ($old_m & 0x0f));
if((($old_m & 0xf0) >> 4) !== $meta){
$this->data{$i} = chr(($old_m & 0xf0) | ($meta & 0x0f));
if(($old_m & 0x0f) !== $meta){
$changed = true;
}
}else{
$this->data{$i} = chr(($old_m & 0xf0) | ($meta & 0x0f));
if(($old_m & 0x0f) !== $meta){
$this->data{$i} = chr((($meta & 0x0f) << 4) | ($old_m & 0x0f));
if((($old_m & 0xf0) >> 4) !== $meta){
$changed = true;
}
}
@ -160,9 +160,9 @@ class Chunk extends BaseFullChunk{
public function getBlockSkyLight($x, $y, $z){
$sl = ord($this->skyLight{($x << 10) + ($z << 6) + ($y >> 1)});
if(($y & 1) === 0){
return $sl >> 4;
}else{
return $sl & 0x0F;
}else{
return $sl >> 4;
}
}
@ -170,18 +170,18 @@ class Chunk extends BaseFullChunk{
$i = ($x << 10) + ($z << 6) + ($y >> 1);
$old_sl = ord($this->skyLight{$i});
if(($y & 1) === 0){
$this->skyLight{$i} = chr((($level & 0x0f) << 4) | ($old_sl & 0x0f));
}else{
$this->skyLight{$i} = chr(($old_sl & 0xf0) | ($level & 0x0f));
}else{
$this->skyLight{$i} = chr((($level & 0x0f) << 4) | ($old_sl & 0x0f));
}
}
public function getBlockLight($x, $y, $z){
$l = ord($this->blockLight{($x << 10) + ($z << 6) + ($y >> 1)});
if(($y & 1) === 0){
return $l >> 4;
}else{
return $l & 0x0F;
}else{
return $l >> 4;
}
}
@ -189,9 +189,9 @@ class Chunk extends BaseFullChunk{
$i = ($x << 10) + ($z << 6) + ($y >> 1);
$old_l = ord($this->blockLight{$i});
if(($y & 1) === 0){
$this->blockLight{$i} = chr((($level & 0x0f) << 4) | ($old_l & 0x0f));
}else{
$this->blockLight{$i} = chr(($old_l & 0xf0) | ($level & 0x0f));
}else{
$this->blockLight{$i} = chr((($level & 0x0f) << 4) | ($old_l & 0x0f));
}
}