From 404e05c06599e03dc73eb59e41207a6456c372f1 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 26 Oct 2020 11:01:05 +0300
Subject: [PATCH] Fixes

---
 .../java/ru/betterend/util/BlocksHelper.java  |  13 ++++++-------
 .../textures/block/crystal_moss_path_top.png  | Bin 2291 -> 2347 bytes
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/betterend/util/BlocksHelper.java b/src/main/java/ru/betterend/util/BlocksHelper.java
index f835bdba..77eb217d 100644
--- a/src/main/java/ru/betterend/util/BlocksHelper.java
+++ b/src/main/java/ru/betterend/util/BlocksHelper.java
@@ -151,27 +151,26 @@ public class BlocksHelper {
 					if (state.isOf(Blocks.CHORUS_PLANT)) {
 						Set<BlockPos> ends = Sets.newHashSet();
 						Set<BlockPos> add = Sets.newHashSet();
-						Set<BlockPos> remove = Sets.newHashSet();
 						ends.add(POS.toImmutable());
 						
-						for (int i = 0; i < 128 && !ends.isEmpty(); i++) {
+						for (int i = 0; i < 64 && !ends.isEmpty(); i++) {
 							ends.forEach((pos) -> {
 								setWithoutUpdate(world, pos, AIR);
 								for (Direction dir: HORIZONTAL) {
 									BlockPos p = pos.offset(dir);
-									if (world.getBlockState(p).isOf(Blocks.CHORUS_PLANT)) {
+									BlockState st = world.getBlockState(p);
+									if ((st.isOf(Blocks.CHORUS_PLANT) || st.isOf(Blocks.CHORUS_FLOWER)) && !st.canPlaceAt(world, p)) {
 										add.add(p);
 									}
 								}
 								BlockPos p = pos.up();
-								if (world.getBlockState(p).isOf(Blocks.CHORUS_PLANT)) {
+								BlockState st = world.getBlockState(p);
+								if ((st.isOf(Blocks.CHORUS_PLANT) || st.isOf(Blocks.CHORUS_FLOWER)) && !st.canPlaceAt(world, p)) {
 									add.add(p);
 								}
-								remove.add(pos);
 							});
+							ends.clear();
 							ends.addAll(add);
-							ends.removeAll(remove);
-							remove.clear();
 							add.clear();
 						}
 					}
diff --git a/src/main/resources/assets/betterend/textures/block/crystal_moss_path_top.png b/src/main/resources/assets/betterend/textures/block/crystal_moss_path_top.png
index 830aaf7571b48539000ca76d95c8b0576e5a239f..c61b7a57f1d45924629b249d24c09f035c4c838d 100644
GIT binary patch
delta 815
zcmew?xLRn#X(kRs11nQYD^v5ymzk6ioPSIf%Bd-dW)`L?rn*U~=83vysU`-xi56xS
zy2(Z+2FB*8Ny+9ZlOvh6RV+-*4NQ%U4RkGxEmL$&j7=<cEtAqxbW>8yQ_T!bjEu~a
z%r~!KE@4zjGB8WBG&4@rwM;Zg)=f(^Nz_d=Pc_yxNw!E#Nij6EOtmnW?7%9;ZVGge
zm8sd}MAmK<BAj6X)Fg>;ydm4V`fJZ-gflQO8F;!lhG?AU4T>zfVjyreFY<9}8;@s0
zfQ;ht$6R-e<V8ZXLX5Vh=3cw>rGLq*N%QWx&9DE*b*<>Gr{1^HiL0dbrtet0ROHeF
zjmXm2)xCvj$5w7pliKq7viag8_pfh%Si^Rz>2`K5Z~T**x{5ph_V$*SKQ;+Dw1~f6
zr+q_ocCE-9>+I;&Q;M5rv?!IWbA4rZ^o9n%-H%*RnFj^yWZPeu<QA0A<5zfp&hw!3
zQdPHWrE?CvKFuxKBz%Z#X^clE&myg4u7wAG?|Uz;c(ZzC$l0At9f=pBnC(uuFYEc4
zYMCVBwX@d$ciwbX&zYyym6kqP^Gr$N@O^<+&H8goCjGULv;2MAeVg?X7fsPQqVFes
zDA`;0|6|LR)@y4*85#0!PnaUd#`GYc``&`Q^XEdnPQIHlMN_q84WpnF*MmD}jGxz3
z|6j1RNHtqGBgEWyhG&HM{&iD~O0MNcuk;OIn4+N>={2o({ghLN7sH-fEPZfMpjIj%
zZp$~5vkf7a>+}9*6|Jq9Jtb@1Wxw3AeXR}+4>mX%KbBbdQ1PwbjL)i57fr}GVq3i8
z`RUYbh3dC+7jI2i$ErHd=hMPzS}pH57fY6wOD(SW`}ettFKdIWyYt$fV$F?CCh5jJ
zfu7s$+ZjweAHQEgVoKA*WFJ%6ciSHP{P6DI$A6zbFzk$2qn6AQz+J53(k#Lx8su-h
z?ev`V0}5N*n1frDA6|-J{t}gPhX3t$vm+WCnPx09jOZ$ySJ)w1@|rE9WNm~?>azdK
W8Rp!T(>C{J00K`}KbLh*2~7ZFXIBgW

delta 758
zcmZ22^jUDjX(kQ>11m#wD`Vrymzk6ioPSIf%7$rXX6DIe2D&LmCKkHpDJE&UmKMn=
zx+%s<iDm{y7HKJ_lOvh6Rm_r%49rr^OmqzrEmL%j4NX#XlZ=v5bdwE|Qc{ys3{#Dh
zO*gM#E@4zLGfgqFNHsOnO-wYl(6ul$NzzSBO19KBwn#KiPBb-5G)Xd>?7%9;4s%l?
zYqts!&agnyWXQIzzUKebM+^*%KRjI=Lp08-26;{rHWbha&3wJh)+|x!f&QOv>-ni1
z9DMT%S8tu7vZ=jUcGH~DohSeN_-6aGmUH7uKPjcKj@KE*=k8exa&G>-?`qb~D)}|v
z{{1XV*S1W*`fSbWTP;hj7(I*l6I8v_@%!!A*<ova+KNu5U7C}uzjI2xQrm2^w0X%@
zuQwc$U^aPHTEboO_}cS=M+P-}@1@DRYNz?V&OH6H$ZC0Q{W;#x5vK#rw>fT^o^qn+
zUa;SUKI0Hp`473SGPm!A?rxg7w^&}gwD<MA?|a{E4ZRb8t+<3yt+9F4wX2<5FZ?a4
zI%qd*idRsMWNjyRP}Mts{eLq4&+AYBeEvRs!NldJJchePtK<9~#Mc?{7B6UeoXMHC
z?K#`m0)D2`M;L!v{hv3_N~G>U-+XuGHt*GQC7Tv^p9qQQ+plPQ<OaKnRmaQC&!_F(
zp?oQMv4oO~P;Jbiq{NT!lNX(Pz@)`2?cTiU!NNuIMz1$5_%u!AwV=Xc?*;t=A+AT*
z>-p`AFZ{2~eGzskx@v#yx(uHd$4qCA{<n=w9=`v2UY|#1>y<wjoAsAIVoTRyogt{|
z|M}}b*3@RHnM(0Hjx*|g40$*IT}95$X^+2N*kagnO*)lH>CxG3X-C%VX?nORZi};s
z9dDN7rspi{ZuKbf#W4Dsh>JJ2^<3+dIoKSvY^I0A8P7lL>HL+;xYka{VE_V8S3j3^
HP6<r_FMmS=