[BumbleLlamaEntity] Fixed #13.

LlamaramaTeam · Mar 21, 2022 · 38b26fb · 38b26fb
1 parent e3ca84f
commit 38b26fb
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/src/main/java/io/github/llamarama/team/common/entity/bumbllama/BumbleLlamaEntity.java b/src/main/java/io/github/llamarama/team/common/entity/bumbllama/BumbleLlamaEntity.java
@@ -46,11 +46,6 @@ public boolean startRiding(Entity entity, boolean force) {
         return false;
     }
 
-    @Override
-    public boolean startRiding(Entity entity) {
-        return false;
-    }
-
     @Override
     public boolean canBeControlledByRider() {
         return false;
@@ -98,16 +93,8 @@ public void tick() {
         BlockState stateForBoneMeal = this.world.getBlockState(down);
 
         boolean isChosen = this.random.nextInt(384) == 0;
-
-        if (isChosen && !this.world.isClient &&
-            stateForBoneMeal.getBlock() instanceof Fertilizable fertilizable &&
-            PosUtilities.checkForNoVelocity(this.getVelocity())) {
-            fertilizable.grow((ServerWorld) this.world, this.random, down, stateForBoneMeal);
-
-            ((ServerWorld) this.world).spawnParticles(
-                ParticleTypes.HAPPY_VILLAGER, this.getX(), this.getY(), this.getZ(),
-                20, 2d, 2d, 2d, 0.0d
-            );
+        if (isChosen && world.isClient) {
+            this.tryGrowPlant(down, stateForBoneMeal);
         }
     }
 
@@ -142,4 +129,18 @@ protected BumbleLlamaEntity getChild() {
         return ModEntityTypes.BUMBLE_LLAMA.create(this.world);
     }
 
+    private void tryGrowPlant(BlockPos down, @NotNull BlockState stateForBoneMeal) {
+        if (stateForBoneMeal.getBlock() instanceof Fertilizable fertilizable &&
+            PosUtilities.checkForNoVelocity(this.getVelocity()) &&
+            fertilizable.isFertilizable(world, down, stateForBoneMeal, world.isClient) &&
+            fertilizable.canGrow(world, this.getRandom(), down, stateForBoneMeal)) {
+            fertilizable.grow((ServerWorld) this.world, this.random, down, stateForBoneMeal);
+
+            ((ServerWorld) this.world).spawnParticles(
+                ParticleTypes.HAPPY_VILLAGER, this.getX(), this.getY(), this.getZ(),
+                20, 2d, 2d, 2d, 0.0d
+            );
+        }
+    }
+
 }