[ci skip] Move some disruptive patches back

patches/server/Only-capture-actual-tree-growth.patch

@@ -33,9 +33,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -0,0 +0,0 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
-         return null;
+         return range <= 0 ? 64.0 * 64.0 : range * range; // 64 is taken from default in ServerLevel#levelEvent
      }
-     // Paper end - optimize redstone (Alternate Current)
+     // Paper end - respect global sound events gamerule
 +    // Paper start - notify observers even if grow failed
 +    public void checkCapturedTreeStateForObserverNotify(final BlockPos pos, final CraftBlockState craftBlockState) {
 +        // notify observers if the block state is the same and the Y level equals the original y level (for mega trees)