mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-15 07:55:31 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/level/format/pmf/LevelFormat.php → src/pocketmine/level/conversor/pmf/LevelFormat.php
View File

@ -19,7 +19,7 @@
* *
*/ */
namespace pocketmine\level\format\pmf; namespace pocketmine\level\conversor\pmf;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\nbt\NBT; use pocketmine\nbt\NBT;

2
src/pocketmine/level/format/pmf/PMF.php → src/pocketmine/level/conversor/pmf/PMF.php
View File

@ -22,7 +22,7 @@
/** /**
* PMF (PocketMine Format) handling * PMF (PocketMine Format) handling
*/ */
namespace pocketmine\level\format\pmf; namespace pocketmine\level\conversor\pmf;
use pocketmine\utils\MainLogger; use pocketmine\utils\MainLogger;

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

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

151
src/pocketmine/level/format/pmf/ChunkSection.php
View File

@ -1,151 +0,0 @@
<?php
/*
*
* ____ _ _ __ __ _ __ __ ____
* | _ \ ___ ___| | _____| |_| \/ (_)_ __ ___ | \/ | _ \
* | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
* | __/ (_) | (__| < __/ |_| | | | | | | | __/_____| | | | __/
* |_| \___/ \___|_|\_\___|\__|_| |_|_|_| |_|\___| |_| |_|_|
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* @author PocketMine Team
* @link http://www.pocketmine.net/
*
*
*/
namespace pocketmine\level\format\pmf;
class ChunkSection implements \pocketmine\level\format\ChunkSection{
const METADATA_OFFSET = 16;
const LIGHT_OFFSET = 24;
const SKYLIGHT_OFFSET = 32;
private $section = "";
public function __construct($section = null){
if($section !== null){
if(strlen($section) !== 8192){
trigger_error("Invalid ChunkSection generated", E_USER_WARNING);
return;
}
$this->section = $section;
}else{
$this->section = str_repeat("\x00\x00\x00\x00\x00\x00\x00\x00", 1024);
}
}
public function getBlockId($x, $y, $z){
return $b = ord($this->section{$y + ($x << 5) + ($z << 9)});
}
public function getBlock($x, $y, $z, &$blockId, &$meta = null){
$i = ($x << 5) + ($z << 9);
$blockId = ord($this->section{$i + $y});
$meta = ord($this->section{($y >> 1) + self::METADATA_OFFSET});
}
public function setBlock($x, $y, $z, $blockId = null, $meta = null){
$i = ($x << 5) + ($z << 9);
if($blockId !== null){
$this->section{$i + $y} = chr($blockId);
}
if($meta !== null){
$i += ($y >> 1) + self::METADATA_OFFSET;
$m = ord($this->section{$i});
if(($y & 1) === 0){
$this->section{$i} = chr(($m & 0xf0) | ($meta & 0x0f));
}else{
$this->section{$i} = chr((($meta & 0x0f) << 4) | ($m & 0x0f));
}
}
}
public function setBlockId($x, $y, $z, $id){
$this->section{$y + ($x << 5) + ($z << 9)} = chr($id & 0xff);
}
public function getBlockData($x, $y, $z){
$m = ord($this->section{($y >> 1) + self::METADATA_OFFSET + ($x << 5) + ($z << 9)});
if(($y & 1) === 0){
return $m & 0x0F;
}else{
return $m >> 4;
}
}
public function setBlockData($x, $y, $z, $data){
$i = ($y >> 1) + self::METADATA_OFFSET + ($x << 5) + ($z << 9);
$m = ord($this->section{$i});
if(($y & 1) === 0){
$this->section{$i} = chr(($m & 0xf0) | ($data & 0x0f));
}else{
$this->section{$i} = chr((($data & 0x0f) << 4) | ($m & 0x0f));
}
}
public function getBlockIdColumn($x, $z){
$column = "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
$i = ($x << 5) + ($z << 9);
for($y = 15; $y >= 0; --$y){
$column{15 - $y} = $this->section{$i + $y};
}
return $column;
}
public function getBlockDataColumn($x, $z){
$column = "\x00\x00\x00\x00\x00\x00\x00\x00";
$i = ($x << 5) + ($z << 9) + self::METADATA_OFFSET;
for($y = 7; $y >= 0; --$y){
$column{7 - $y} = $this->section{$i + $y};
}
return $column;
}
public function getBlockLight($x, $y, $z){
$l = ord($this->section{($y >> 1) + self::LIGHT_OFFSET + ($x << 5) + ($z << 9)});
if(($y & 1) === 0){
return $l & 0x0F;
}else{
return $l >> 4;
}
}
public function setBlockLight($x, $y, $z, $level){
$i = ($y >> 1) + self::LIGHT_OFFSET + ($x << 5) + ($z << 9);
$l = ord($this->section{$i});
if(($y & 1) === 0){
$this->section{$i} = chr(($l & 0xf0) | ($level & 0x0f));
}else{
$this->section{$i} = chr((($level & 0x0f) << 4) | ($l & 0x0f));
}
}
public function getBlockSkyLight($x, $y, $z){
$sl = ord($this->section{($y >> 1) + self::SKYLIGHT_OFFSET + ($x << 5) + ($z << 9)});
if(($y & 1) === 0){
return $sl & 0x0F;
}else{
return $sl >> 4;
}
}
public function setBlockSkyLight($x, $y, $z, $level){
$i = ($y >> 1) + self::SKYLIGHT_OFFSET + ($x << 5) + ($z << 9);
$sl = ord($this->section{$i});
if(($y & 1) === 0){
$this->section{$i} = chr(($sl & 0xf0) | ($level & 0x0f));
}else{
$this->section{$i} = chr((($level & 0x0f) << 4) | ($sl & 0x0f));
}
}
}