mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-20 19:49:44 +00:00
infinite obsidian generator should be fixed
This commit is contained in:
parent
833b04e0fc
commit
1545903159
3 changed files with 13 additions and 7 deletions
|
|
@ -34,7 +34,7 @@ class LavaBlock extends LiquidBlock implements LightingBlock{
|
|||
for($side = 0; $side <= 5; ++$side){
|
||||
$b = $this->getSide($side);
|
||||
if($b instanceof WaterBlock){
|
||||
$level = $this->meta & 0x06;
|
||||
$level = $this->meta & 0x07;
|
||||
if($level == 0x00){
|
||||
$this->level->setBlock($b, new ObsidianBlock(), false, false, true);
|
||||
}else{
|
||||
|
|
@ -66,9 +66,9 @@ class LavaBlock extends LiquidBlock implements LightingBlock{
|
|||
return false;
|
||||
}
|
||||
|
||||
if($this->checkWater()){
|
||||
/*if($this->checkWater()){
|
||||
return;
|
||||
}
|
||||
}*/
|
||||
|
||||
$falling = $this->meta >> 3;
|
||||
$down = $this->getSide(0);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ class WaterBlock extends LiquidBlock{
|
|||
}
|
||||
$b = $this->getSide($side);
|
||||
if($b instanceof LavaBlock){
|
||||
$level = $b->meta & 0x07;
|
||||
$level = $b->meta & 0x06;
|
||||
if($level == 0x00){
|
||||
$this->level->setBlock($b, new ObsidianBlock(), false, false, true);
|
||||
}else{
|
||||
|
|
@ -118,4 +118,4 @@ class WaterBlock extends LiquidBlock{
|
|||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class BucketItem extends Item{
|
|||
return true;
|
||||
}
|
||||
}elseif($this->meta === LAVA){
|
||||
if($block->getID() === AIR){
|
||||
if($block->getID() === AIR || ($block instanceof LavaBlock && ($block->getMetadata() & 0x6) != 0)){
|
||||
$lava = new LavaBlock();
|
||||
$level->setBlock($block, $lava, true, false, true);
|
||||
ServerAPI::request()->api->block->scheduleBlockUpdate($block, 40, BLOCK_UPDATE_NORMAL);
|
||||
|
|
@ -45,8 +45,14 @@ class BucketItem extends Item{
|
|||
$this->meta = 0;
|
||||
}
|
||||
return true;
|
||||
}elseif($block instanceof WaterBlock){
|
||||
$level->setBlock($block, new ObsidianBlock(), true, false, true);
|
||||
if(($player->gamemode & 0x01) === 0){
|
||||
$this->meta = 0;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue