Merge pull request #438 from sj-hub9796/fix-quality-food-compat

Author: C0D3-M4513R

patches/minecraft/net/minecraft/world/level/block/SugarCaneBlock.java.patch

@@ -9,7 +9,7 @@
     public static final IntegerProperty AGE = BlockStateProperties.AGE_15;
     protected static final float AABB_OFFSET = 6.0F;
     protected static final VoxelShape SHAPE = Block.box(2.0D, 0.0D, 2.0D, 14.0D, 16.0D, 14.0D);
-@@ -47,11 +_,15 @@
+@@ -47,11 +_,17 @@
 
           if (i < 3) {
              int j = p_222548_.getValue(AGE);
@@ -21,8 +21,10 @@
 +            if (net.minecraftforge.common.ForgeHooks.onCropsGrowPre(p_222549_, p_222550_, p_222548_, true)) {
 +               int modifier = p_222549_.spigotConfig.caneModifier; // Spigot - SPIGOT-7159: Better modifier resolution
 +               if (j >= 15 || (modifier != 100 && p_222551_.nextFloat() < (modifier / (100.0f * 16)))) { // Spigot - SPIGOT-7159: Better modifier resolution
++                  org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory.handleBlockGrowUpdate.set(false); // Ketting - mixin compat
 +                  org.bukkit.craftbukkit.v1_20_R1.event.CraftEventFactory.handleBlockGrowEvent(p_222549_, p_222550_.above(), this.defaultBlockState()); // CraftBukkit
 +                  net.minecraftforge.common.ForgeHooks.onCropsGrowPost(p_222549_, p_222550_.above(), this.defaultBlockState());
++                  p_222549_.setBlockAndUpdate(p_222550_.above(), this.defaultBlockState()); // Ketting - mixin compat
 +                  p_222549_.setBlock(p_222550_, p_222548_.setValue(AGE, Integer.valueOf(0)), 4);
 +               } else {
 +                  p_222549_.setBlock(p_222550_, p_222548_.setValue(AGE, Integer.valueOf(j + 1)), 4);

src/main/java/org/bukkit/craftbukkit/v1_20_R1/event/CraftEventFactory.java

@@ -1210,6 +1210,7 @@ public static boolean handleBlockGrowEvent(Level world, BlockPos pos, net.minecr
         return handleBlockGrowEvent(world, pos, block, 3);
     }
 
+    public static AtomicBoolean handleBlockGrowUpdate = new AtomicBoolean(true); // Ketting
     public static boolean handleBlockGrowEvent(Level world, BlockPos pos, net.minecraft.world.level.block.state.BlockState newData, int flag) {
         Block block = world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ());
         CraftBlockState state = (CraftBlockState) block.getState();
@@ -1219,7 +1220,11 @@ public static boolean handleBlockGrowEvent(Level world, BlockPos pos, net.minecr
         Bukkit.getPluginManager().callEvent(event);
 
         if (!event.isCancelled()) {
-            state.update(true);
+            // ketting start - Possibility to move the handle to the vanilla method
+            if (handleBlockGrowUpdate.getAndSet(true)) {
+                state.update(true);
+            }
+            // Ketting end
         }
 
         return !event.isCancelled();