From 6f6f98cb68b53b2b75fc7d2b35db170728a5c3de Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Tue, 10 May 2022 14:51:15 +0300 Subject: [PATCH] lava & water fix --- src/material/block/liquid/Lava.php | 40 +++++++++++++--------------- src/material/block/liquid/Water.php | 27 +++++++++---------- src/material/item/generic/Bucket.php | 4 ++- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/src/material/block/liquid/Lava.php b/src/material/block/liquid/Lava.php index 4e2c2266..d66f0515 100644 --- a/src/material/block/liquid/Lava.php +++ b/src/material/block/liquid/Lava.php @@ -36,7 +36,7 @@ class LavaBlock extends LiquidBlock{ for($side = 2; $side <= 5; ++$side){ if($this->getSide($side) instanceof LavaBlock ){ $b = $this->getSide($side); - $level = $b->meta & 0x07; + $level = $b->meta & 0x06; if($level == 0x00){ $count++; } @@ -49,7 +49,7 @@ class LavaBlock extends LiquidBlock{ for($side = 1; $side <= 5; ++$side){ $b = $this->getSide($side); if($b instanceof WaterBlock){ - $level = $this->meta & 0x07; + $level = $this->meta & 0x06; if($level == 0x00){ $this->level->setBlock($this, new ObsidianBlock(), false, false, true); }else{ @@ -63,9 +63,9 @@ class LavaBlock extends LiquidBlock{ for($side = 0; $side <= 5; ++$side){ $b = $this->getSide($side); if($b instanceof LavaBlock){ - $tlevel = $b->meta & 0x07; - $level = $this->meta & 0x07; - if( ($tlevel + 2) == $level || ($side == 0x01 && $level == 0x01 ) || ($tlevel == 6 && $level == 7 )){ + $tlevel = $b->meta & 0x06; + $level = $this->meta & 0x06; + if( ($tlevel + 2) == $level || ($side == 0x01 && $level == 0x01 ) || ($tlevel == 6 && $level == 6 )){ return $b; } } @@ -76,7 +76,7 @@ class LavaBlock extends LiquidBlock{ public function onUpdate($type){ //return false; $newId = $this->id; - $level = $this->meta & 0x07; + $level = $this->meta & 0x06; if($type !== BLOCK_UPDATE_NORMAL){ return false; } @@ -90,19 +90,17 @@ class LavaBlock extends LiquidBlock{ $from = $this->getFrom(); if($from !== null || $level == 0x00){ - if($level !== 0x07){ - if($down instanceof AirBlock || $down instanceof LavaBlock){ - $this->level->setBlock($down, new LavaBlock(0x01), false, false, true); - ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 40, BLOCK_UPDATE_NORMAL); - }else{ - for($side = 2; $side <= 5; ++$side){ - $b = $this->getSide($side); - if($b instanceof LavaBlock){ - - }elseif($b->isFlowable === true){ - $this->level->setBlock($b, new LavaBlock( min($level + 2,7) ), false, false, true); - ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 40, BLOCK_UPDATE_NORMAL); - } + if($down instanceof AirBlock || $down instanceof LavaBlock){ + $this->level->setBlock($down, new LavaBlock(0x01), false, false, true); + ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 40, BLOCK_UPDATE_NORMAL); + }elseif($level !== 0x06){ + for($side = 2; $side <= 5; ++$side){ + $b = $this->getSide($side); + if($b instanceof LavaBlock){ + + }elseif($b->isFlowable === true){ + $this->level->setBlock($b, new LavaBlock( min($level + 2,6) ), false, false, true); + ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 40, BLOCK_UPDATE_NORMAL); } } } @@ -111,7 +109,7 @@ class LavaBlock extends LiquidBlock{ for($side = 2; $side <= 5; ++$side){ $sb = $this->getSide($side); if($sb instanceof LavaBlock){ - $tlevel = $sb->meta & 0x07; + $tlevel = $sb->meta & 0x06; if($tlevel != 0x00){ for ($s = 0; $s <= 5; $s++) { $ssb = $sb->getSide($s); @@ -122,7 +120,7 @@ class LavaBlock extends LiquidBlock{ } $b = $this->getSide(0)->getSide($side); if($b instanceof LavaBlock){ - $tlevel = $b->meta & 0x07; + $tlevel = $b->meta & 0x06; if($tlevel != 0x00){ for ($s = 0; $s <= 5; $s++) { $ssb = $sb->getSide($s); diff --git a/src/material/block/liquid/Water.php b/src/material/block/liquid/Water.php index 0efdc40d..ef26b2ad 100644 --- a/src/material/block/liquid/Water.php +++ b/src/material/block/liquid/Water.php @@ -94,24 +94,23 @@ class WaterBlock extends LiquidBlock{ $from = $this->getFrom(); //Has Source or Its Source if($from !== null || $level == 0x00){ - if($level !== 0x07){ - if($down instanceof AirBlock || $down instanceof WaterBlock){ - $this->level->setBlock($down, new WaterBlock(0x01), false, false, true); - ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL); - }else{ - for($side = 2; $side <= 5; ++$side){ - $b = $this->getSide($side); - if($b instanceof WaterBlock){ - if( $this->getSourceCount() >= 2 && $level != 0x00){ - $this->level->setBlock($this, new WaterBlock(0), false, false, true); - } - }elseif($b->isFlowable === true){ - $this->level->setBlock($b, new WaterBlock($level + 1), false, false, true); - ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL); + if($down instanceof AirBlock || $down instanceof WaterBlock){ + $this->level->setBlock($down, new WaterBlock(0x01), false, false, true); + ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($down, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL); + }elseif($level !== 0x07){{ + for($side = 2; $side <= 5; ++$side){ + $b = $this->getSide($side); + if($b instanceof WaterBlock){ + if( $this->getSourceCount() >= 2 && $level != 0x00){ + $this->level->setBlock($this, new WaterBlock(0), false, false, true); } + }elseif($b->isFlowable === true){ + $this->level->setBlock($b, new WaterBlock($level + 1), false, false, true); + ServerAPI::request()->api->block->scheduleBlockUpdate(new Position($b, 0, 0, $this->level), 10, BLOCK_UPDATE_NORMAL); } } } + } }else{ //Extend Remove for Left Waters for($side = 2; $side <= 5; ++$side){ diff --git a/src/material/item/generic/Bucket.php b/src/material/item/generic/Bucket.php index d011f9ee..fb77a1b0 100644 --- a/src/material/item/generic/Bucket.php +++ b/src/material/item/generic/Bucket.php @@ -48,7 +48,9 @@ class BucketItem extends Item{ } }elseif($this->meta === LAVA){ if($block->getID() === AIR){ - $level->setBlock($block, new LavaBlock(), true, false, true); + $lava = new LavaBlock(); + $level->setBlock($block, $lava, true, false, true); + $lava->place(clone $this, $player, $block, $target, $face, $fx, $fy, $fz); if(($player->gamemode & 0x01) === 0){ $this->meta = 0; }