diff --git a/src/world/Entity.php b/src/world/Entity.php index b0fd0598..385d4be3 100644 --- a/src/world/Entity.php +++ b/src/world/Entity.php @@ -617,7 +617,11 @@ class Entity extends Position{ if($y < $this->fallY){ $d = $this->level->getBlock(new Vector3($x, $y + 1, $z)); $d2 = $this->level->getBlock(new Vector3($x, $y + 2, $z)); + $blockToFallOn = $this->level->getBlock(new Vector3(floor($x), floor($y), floor($z))); $dmg = ($this->fallY - $y) - 3; + if($blockToFallOn->getID() === FARMLAND){ + $this->level->setBlockRaw($blockToFallOn,new DirtBlock()); + } if($dmg > 0 and !($d instanceof LiquidBlock) and $d->getID() !== LADDER and $d->getID() !== COBWEB and !($d2 instanceof LiquidBlock) and $d2->getID() !== LADDER and $d2->getID() !== COBWEB){ $this->harm($dmg, "fall"); } diff --git a/src/world/generator/object/NetherReactorStructure.php b/src/world/generator/object/NetherReactorStructure.php index 24dc9d42..74da6e9d 100644 --- a/src/world/generator/object/NetherReactorStructure.php +++ b/src/world/generator/object/NetherReactorStructure.php @@ -48,9 +48,9 @@ class NetherReactorStructure{ "N N", "N N", "N N", - "N N", - "N N", - "N N", + "N ___ N", + "N ___ N", + "N ___ N", "N N", "N N", "N N", @@ -67,9 +67,9 @@ class NetherReactorStructure{ "N N", "N N", "N N", - "N N", - "N N", - "N N", + "N ___ N", + "N ___ N", + "N ___ N", "N N", "N N", "N N", @@ -87,9 +87,9 @@ class NetherReactorStructure{ "N N", "N N", "N N", - "N N", - "N N", - "N N", + "N ___ N", + "N ___ N", + "N ___ N", "N N", "N N", "N N", @@ -600,6 +600,13 @@ class NetherReactorStructure{ case "N": //Netherrack $level->setBlockRaw(new Vector3($x - 8 + $offsetX, $y - 1 + $layerCount, $z - 8 + $offsetZ), new NetherrackBlock()); break; + case " ": + $block = $level->getBlock(new Vector3($x - 8 + $offsetX, $y - 1 + $layerCount, $z - 8 + $offsetZ))->getID(); + if($block == 0){ + continue; + } + $level->setBlockRaw(new Vector3($x - 8 + $offsetX, $y - 1 + $layerCount, $z - 8 + $offsetZ), new AirBlock()); + break; } ++$offsetX; }