diff --git a/src/PocketMinecraftServer.php b/src/PocketMinecraftServer.php index 03ca736e..92849167 100644 --- a/src/PocketMinecraftServer.php +++ b/src/PocketMinecraftServer.php @@ -227,7 +227,7 @@ class PocketMinecraftServer{ "url" => $url, "data" => [ "username" => $name, - "content" => $this->extraprops->get("discord-ru-smiles") ? str_replace("@", " ", str_replace("Ы", "<:smile_cool:1007021190294032534>", str_replace("Ь", "<:smile_cry:1007021188490477718>", str_replace("Ъ", "<:smile_happy:1007021186745630851>", str_replace("Ё", "<:smile_neutral:1007021184874979409>", $msg))))) : str_replace("@", "", $msg) + "content" => $this->extraprops->get("discord-ru-smiles") ? str_replace("@", " ", str_replace("Ы", "<:imp_cool:1151085500396998719>", str_replace("Ь", "<:imp_badphp5:1151085478410457120>", str_replace("Ъ", "<:imp_gudjava:1151085431962742784>", str_replace("Ё", "<:imp_wut:1151085524241621012>", $msg))))) : str_replace("@", "", $msg) ], ], null); } diff --git a/src/material/block/liquid/LavaBlock.php b/src/material/block/liquid/LavaBlock.php index 300e74a1..832f688b 100644 --- a/src/material/block/liquid/LavaBlock.php +++ b/src/material/block/liquid/LavaBlock.php @@ -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); diff --git a/src/material/block/liquid/WaterBlock.php b/src/material/block/liquid/WaterBlock.php index aaf8083c..d49cb318 100644 --- a/src/material/block/liquid/WaterBlock.php +++ b/src/material/block/liquid/WaterBlock.php @@ -27,22 +27,23 @@ class WaterBlock extends LiquidBlock{ } public function checkLava(){ + $ret = false; for($side = 0; $side <= 5; ++$side){ if($side == 1){ continue; } $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{ $this->level->setBlock($b, new CobblestoneBlock(), false, false, true); } - return true; + $ret = true; } } - return false; + return $ret; } public function getFrom(){ @@ -118,4 +119,4 @@ class WaterBlock extends LiquidBlock{ } return false; } -} \ No newline at end of file +} diff --git a/src/material/item/generic/BucketItem.php b/src/material/item/generic/BucketItem.php index 4d23cccb..4a71ecbf 100644 --- a/src/material/item/generic/BucketItem.php +++ b/src/material/item/generic/BucketItem.php @@ -25,7 +25,7 @@ class BucketItem extends Item{ } }elseif($this->meta === WATER){ //Support Make Non-Support Water to Support Water - if($block->getID() === AIR || ( $block instanceof WaterBlock && ($block->getMetadata() & 0x07) != 0x00 ) ){ + if($block->getID() === AIR || ( $block instanceof WaterBlock && ($block->getMetadata() & 0x07) != 0x00 ) || ($block instanceof LavaBlock)){ $water = new WaterBlock(); $level->setBlock($block, $water, true, false, true); ServerAPI::request()->api->block->scheduleBlockUpdate($block, 5, BLOCK_UPDATE_NORMAL); @@ -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; } -} \ No newline at end of file +}