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

Fixed crash when placing water or lava

Browse Source
This commit is contained in:
Shoghi Cervantes 2014-07-28 12:18:17 +02:00
parent e219f4784c
commit ed90d58e32
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pocketmine/block/Lava.php
View File

@ -35,7 +35,7 @@ class Lava extends Liquid{
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){
$ret = $this->getLevel()->setBlock($this, $this, true, false, true); $ret = $this->getLevel()->setBlock($this, $this, true, false, true);
Server::getInstance()->api->block->scheduleBlockUpdate(clone $this, 40, Level::BLOCK_UPDATE_NORMAL); $this->getLevel()->scheduleUpdate(clone $this, 40);
return $ret; return $ret;
} }
@ -85,7 +85,7 @@ class Lava extends Liquid{
} }
public function onUpdate($type){ public function onUpdate($type){
//return false; return false;
$newId = $this->id; $newId = $this->id;
$level = $this->meta & 0x07; $level = $this->meta & 0x07;
if($type !== Level::BLOCK_UPDATE_NORMAL){ if($type !== Level::BLOCK_UPDATE_NORMAL){

4
src/pocketmine/block/Water.php
View File

@ -35,7 +35,7 @@ class Water extends Liquid{
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){
$ret = $this->getLevel()->setBlock($this, $this, true, false, true); $ret = $this->getLevel()->setBlock($this, $this, true, false, true);
Server::getInstance()->api->block->scheduleBlockUpdate(clone $this, 10, Level::BLOCK_UPDATE_NORMAL); $this->getLevel()->scheduleUpdate(clone $this, 10);
return $ret; return $ret;
} }
@ -92,7 +92,7 @@ class Water extends Liquid{
} }
public function onUpdate($type){ public function onUpdate($type){
//return false; return false;
$newId = $this->id; $newId = $this->id;
$level = $this->meta & 0x07; $level = $this->meta & 0x07;
if($type !== Level::BLOCK_UPDATE_NORMAL){ if($type !== Level::BLOCK_UPDATE_NORMAL){