Merge branch 'master' into leveltweaks

This commit is contained in:
for(int i = 0;i 100; ++i){EntityPlayer p = mc.thePlayer; mc.getSendQueue().addToSendQueue(new Packet11PlayerPosition(p.posX + 0.15*i, p.boundingBox.minY, p.posY, p.posZ + 0.15*i, true)); mc.getSendQueue().addToSendQueue(new Packet19EntityAction(p, 3));} 2026-05-16 07:54:01 +03:00 • committed by GitHub
commit dee0ea09fb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 88 additions and 23 deletions

View file

@ -21,7 +21,7 @@ class SignPostBlock extends TransparentBlock{
}
public function place(Item $item, Player $player, Block $block, Block $target, $face, $fx, $fy, $fz){
if(($target->isSolid || $target->getID() === SIGN_POST || $target->getID() === WALL_SIGN) && $face !== 0){
if(($target->isSolid || $target->getID() === SIGN_POST || $target->getID() === WALL_SIGN || $target->getID() === GLASS_PANE || $target->getID() === IRON_BARS || $target->getID() === STONE_WALL) && $face !== 0){
if(!isset(self::$faces[$face])){
$this->meta = floor((($player->entity->yaw + 180) * 16 / 360) + 0.5) & 0x0F;
$this->level->setBlock($block, BlockAPI::get(SIGN_POST, $this->meta), true, false, true);

View file

@ -23,7 +23,7 @@ class WallSignBlock extends SignPostBlock{
default => WALL_SIGN
};
if(!StaticBlock::getIsSolid($attached) && $attached != SIGN_POST && $attached != WALL_SIGN){
if(!StaticBlock::getIsSolid($attached) && $attached != SIGN_POST && $attached != WALL_SIGN && $attached != GLASS_PANE && $attached != IRON_BARS && $attached != STONE_WALL){
$level->fastSetBlockUpdate($x, $y, $z, 0, 0, true, true);
(ServerAPI::request())->api->entity->drop(new Position($x + 0.5, $y + 0.5, $z + 0.5, $level), BlockAPI::getItem(SIGN, 0, 1));
}

View file

@ -39,7 +39,7 @@ class BucketItem extends Item{
return true;
}
}elseif($this->meta === WATER){
if($block->getID() === AIR || $block instanceof LiquidBlock){
if($block->getID() === AIR || $block->getID() === TORCH || $block instanceof LiquidBlock){
$water = new WaterBlock();
$level->setBlock($block, $water, true, false, true);
//$water->place($this, $player, $block, $target, $face, $fx, $fy, $fz);
@ -54,7 +54,7 @@ class BucketItem extends Item{
return true;
}
}elseif($this->meta === LAVA){
if($block->getID() === AIR || $block instanceof LiquidBlock){
if($block->getID() === AIR || $block->getID() === TORCH || $block instanceof LiquidBlock){
$lava = new LavaBlock();
$level->setBlock($block, $lava, true, false, true);
//$lava->place(clone $this, $player, $block, $target, $face, $fx, $fy, $fz);