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

Fixed vine block update crashes, close #1032

Browse Source 
The meta->side array was the wrong way round (keys & values inverted).
This commit is contained in:
Dylan K. Taylor 2017-06-08 09:32:38 +01:00
parent cc1d1b0f45
commit 1f630e57f2
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/pocketmine/block/Vine.php
View File

@ -26,9 +26,14 @@ use pocketmine\item\Item;
use pocketmine\item\Tool; use pocketmine\item\Tool;
use pocketmine\level\Level; use pocketmine\level\Level;
use pocketmine\math\AxisAlignedBB; use pocketmine\math\AxisAlignedBB;
use pocketmine\math\Vector3;
use pocketmine\Player; use pocketmine\Player;
class Vine extends Transparent{ class Vine extends Transparent{
const FLAG_SOUTH = 0x01;
const FLAG_WEST = 0x02;
const FLAG_NORTH = 0x04;
const FLAG_EAST = 0x08;
protected $id = self::VINE; protected $id = self::VINE;
@ -75,7 +80,7 @@ class Vine extends Transparent{
$flag = $this->meta > 0; $flag = $this->meta > 0;
if(($this->meta & 0x02) > 0){ if(($this->meta & self::FLAG_WEST) > 0){
$f4 = max($f4, 0.0625); $f4 = max($f4, 0.0625);
$f1 = 0; $f1 = 0;
$f2 = 0; $f2 = 0;
@ -85,7 +90,7 @@ class Vine extends Transparent{
$flag = true; $flag = true;
} }
if(($this->meta & 0x08) > 0){ if(($this->meta & self::FLAG_EAST) > 0){
$f1 = min($f1, 0.9375); $f1 = min($f1, 0.9375);
$f4 = 1; $f4 = 1;
$f2 = 0; $f2 = 0;
@ -95,7 +100,7 @@ class Vine extends Transparent{
$flag = true; $flag = true;
} }
if(($this->meta & 0x01) > 0){ if(($this->meta & self::FLAG_SOUTH) > 0){
$f3 = min($f3, 0.9375); $f3 = min($f3, 0.9375);
$f6 = 1; $f6 = 1;
$f1 = 0; $f1 = 0;
@ -105,7 +110,7 @@ class Vine extends Transparent{
$flag = true; $flag = true;
} }
if(!$flag and $this->getSide(1)->isSolid()){ if(!$flag and $this->getSide(Vector3::SIDE_UP)->isSolid()){
$f2 = min($f2, 0.9375); $f2 = min($f2, 0.9375);
$f5 = 1; $f5 = 1;
$f1 = 0; $f1 = 0;
@ -126,12 +131,13 @@ class Vine extends Transparent{
public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){ public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
//TODO: multiple sides
if($target->isSolid()){ if($target->isSolid()){
$faces = [ $faces = [
2 => 1, 2 => self::FLAG_SOUTH,
3 => 4, 3 => self::FLAG_NORTH,
4 => 8, 4 => self::FLAG_EAST,
5 => 2, 5 => self::FLAG_WEST,
]; ];
if(isset($faces[$face])){ if(isset($faces[$face])){
$this->meta = $faces[$face]; $this->meta = $faces[$face];
@ -147,11 +153,16 @@ class Vine extends Transparent{
public function onUpdate($type){ public function onUpdate($type){
if($type === Level::BLOCK_UPDATE_NORMAL){ if($type === Level::BLOCK_UPDATE_NORMAL){
$sides = [ $sides = [
1 => 3,
2 => 4, 2 => 4,
3 => 1,
4 => 2, 4 => 2,
5 => 8 8 => 5
]; ];
if(!isset($sides[$this->meta])){
return false; //TODO: remove this once placing on multiple sides is supported (these are bitflags, not actual meta values
}
if(!$this->getSide($sides[$this->meta])->isSolid()){ //Replace with common break method if(!$this->getSide($sides[$this->meta])->isSolid()){ //Replace with common break method
$this->level->useBreakOn($this); $this->level->useBreakOn($this);
return Level::BLOCK_UPDATE_NORMAL; return Level::BLOCK_UPDATE_NORMAL;