From 04eb5f9dffa8f98043d987e58a4794fd43d41fb4 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 22 Oct 2020 21:17:28 +0300
Subject: [PATCH] Fixes

---
 src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java   | 7 ++++++-
 src/main/java/ru/betterend/blocks/EndPortalBlock.java      | 1 -
 src/main/java/ru/betterend/blocks/RunedFlavolite.java      | 2 --
 .../ru/betterend/mixin/common/ServerPlayerEntityMixin.java | 1 -
 .../betterend/world/features/DefaultEndPortalFeature.java  | 1 -
 .../java/ru/betterend/world/features/EndPortalFeature.java | 1 -
 6 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java b/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
index 383b52f3..dd82fd3b 100644
--- a/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
+++ b/src/main/java/ru/betterend/blocks/BlockEndLotusSeed.java
@@ -34,7 +34,8 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge {
 			TripleShape shape = (height == 0) ? TripleShape.TOP : TripleShape.MIDDLE;
 			Direction dir = BlocksHelper.randomHorizontal(random);
 			BlockPos leafCenter = bpos.toImmutable().offset(dir);
-			if (hasLeaf(world, leafCenter)) {
+			boolean hasLeaf = hasLeaf(world, leafCenter);
+			if (hasLeaf) {
 				generateLeaf(world, leafCenter);
 				BlocksHelper.setWithoutUpdate(world, bpos, startLeaf.with(BlockEndLotusStem.SHAPE, shape).with(BlockEndLotusStem.FACING, dir));
 			}
@@ -69,6 +70,10 @@ public class BlockEndLotusSeed extends BlockUnderwaterPlantWithAge {
 					stem = stem.with(BlockEndLotusStem.WATERLOGGED, true);
 				}
 			}
+			if (hasLeaf) {
+				stem = stem.with(BlockEndLotusStem.LEAF, true).with(BlockEndLotusStem.FACING, dir);
+			}
+			
 			BlocksHelper.setWithoutUpdate(world, bpos, stem.with(BlockEndLotusStem.SHAPE, TripleShape.TOP));
 		}
 	}
diff --git a/src/main/java/ru/betterend/blocks/EndPortalBlock.java b/src/main/java/ru/betterend/blocks/EndPortalBlock.java
index 69153e55..b5cf09ae 100644
--- a/src/main/java/ru/betterend/blocks/EndPortalBlock.java
+++ b/src/main/java/ru/betterend/blocks/EndPortalBlock.java
@@ -5,7 +5,6 @@ import java.util.Random;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
diff --git a/src/main/java/ru/betterend/blocks/RunedFlavolite.java b/src/main/java/ru/betterend/blocks/RunedFlavolite.java
index 241cb382..bdaa9c14 100644
--- a/src/main/java/ru/betterend/blocks/RunedFlavolite.java
+++ b/src/main/java/ru/betterend/blocks/RunedFlavolite.java
@@ -1,7 +1,6 @@
 package ru.betterend.blocks;
 
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.player.PlayerEntity;
@@ -9,7 +8,6 @@ import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-
 import ru.betterend.blocks.basis.BlockBase;
 import ru.betterend.registry.BlockRegistry;
 import ru.betterend.util.BlocksHelper;
diff --git a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java
index 9e8aa9b7..628dd1d3 100644
--- a/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java
+++ b/src/main/java/ru/betterend/mixin/common/ServerPlayerEntityMixin.java
@@ -30,7 +30,6 @@ import net.minecraft.world.TeleportTarget;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldProperties;
 import net.minecraft.world.biome.source.BiomeAccess;
-
 import ru.betterend.interfaces.TeleportingEntity;
 
 @Mixin(ServerPlayerEntity.class)
diff --git a/src/main/java/ru/betterend/world/features/DefaultEndPortalFeature.java b/src/main/java/ru/betterend/world/features/DefaultEndPortalFeature.java
index c568b376..dbe8f8b8 100644
--- a/src/main/java/ru/betterend/world/features/DefaultEndPortalFeature.java
+++ b/src/main/java/ru/betterend/world/features/DefaultEndPortalFeature.java
@@ -8,7 +8,6 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.world.StructureWorldAccess;
 import net.minecraft.world.gen.chunk.ChunkGenerator;
 import net.minecraft.world.gen.feature.Feature;
-
 import ru.betterend.blocks.EndPortalBlock;
 import ru.betterend.blocks.RunedFlavolite;
 import ru.betterend.registry.BlockRegistry;
diff --git a/src/main/java/ru/betterend/world/features/EndPortalFeature.java b/src/main/java/ru/betterend/world/features/EndPortalFeature.java
index dd192115..55127f11 100644
--- a/src/main/java/ru/betterend/world/features/EndPortalFeature.java
+++ b/src/main/java/ru/betterend/world/features/EndPortalFeature.java
@@ -2,7 +2,6 @@ package ru.betterend.world.features;
 
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.gen.GenerationStep;
-
 import ru.betterend.blocks.RunedFlavolite;
 
 public class EndPortalFeature extends EndFeature {