Updated Upstream (Pufferfish)

Upstream has released updates that appear to apply and compile correctly

Pufferfish Changes:
pufferfish-gg/Pufferfish@4d16ae0 Drop a patch - moonrise includes it
pufferfish-gg/Pufferfish@52c2d05 Revert "Drop a patch - moonrise includes it"
pufferfish-gg/Pufferfish@bdb56f1 Fix entity interactions with fluids
pufferfish-gg/Pufferfish@469e5c1 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@d75961f 1.21.1 Update (Updated Upstream (Paper))

patches/server/0001-Pufferfish-Server-Changes.patch

@@ -340,7 +340,7 @@ index 0000000000000000000000000000000000000000..020368da69b9a492155f6de6297f7473
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d63994b04e8848c620024c148f72af9095cd93a3
+index 0000000000000000000000000000000000000000..11075b0b4d4c5591850704999868c678348170ff
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
 @@ -0,0 +1,299 @@
@@ -627,14 +627,14 @@ index 0000000000000000000000000000000000000000..d63994b04e8848c620024c148f72af90
 +				"This can improve performance by a few percent, but has minor gameplay implications.");
 +	}
 +
-+    public static boolean allowEndCrystalRespawn;
-+    private static void allowEndCrystalRespawn() {
-+        allowEndCrystalRespawn = getBoolean("allow-end-crystal-respawn", true,
-+                "Allows end crystals to respawn the ender dragon.",
-+                "On servers that expect end crystal fights in the end dimension, disabling this",
-+                "will prevent the server from performing an expensive search to attempt respawning",
-+                "the ender dragon whenever a player places an end crystal.");
-+    }
++	public static boolean allowEndCrystalRespawn;
++	private static void allowEndCrystalRespawn() {
++		allowEndCrystalRespawn = getBoolean("allow-end-crystal-respawn", true,
++				"Allows end crystals to respawn the ender dragon.",
++				"On servers that expect end crystal fights in the end dimension, disabling this",
++				"will prevent the server from performing an expensive search to attempt respawning",
++				"the ender dragon whenever a player places an end crystal.");
++	}
 +
 +    public static boolean disableMethodProfiler;
 +    private static void miscSettings() {
@@ -1413,7 +1413,7 @@ index 2fe9d9b38c01d04416843fdd48d3e33899b7de63..5a9712de8abe3c3ccd08c5699f89e3ce
 
              if (this.isRainingAt(blockposition)) {
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 624b80c796e9c95040d71d1595d11f98e2899cf3..74214676417ec488b47c456b718d62ac656eb820 100644
+index 60ff21c8df4168f14da04a12073bde47cd4693c4..301dc8ea0574f02f28067cda397683c7e7a6152f 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -1123,6 +1123,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -1572,7 +1572,7 @@ index cb61462d4691a055a4b25f7b953609d8a154fdfe..f9440014ab2fe753c16b9383f5fffbb8
      private String descriptionId;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index fe435d4a387bb28be6831cec0c8bb0a7c8b603a4..7b54a43ba411b787c0bf522d111da10aea1715f6 100644
+index ccd9dff20a60f019e0c320acfb526b8bf3e5f806..ce0d28cafcae0b7edc861749a1652ecc08d298b5 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -2045,7 +2045,7 @@ index 6e66141dca61f777b354854b5d0bac2570b8bf3b..abf231e6099cda766d73e67f31234e9f
          return false;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
-index a01c0d9ae53d1b748c5da914069bd672cb1215c7..a694fe9cffe96fc425bbd29af430f67813ff8e8c 100644
+index de64de5d1328d3e0826c9990eb7c7eca5088cb9c..245d3d1630a11b3527f20f1135ce29cfe22ff347 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java
 @@ -52,6 +52,36 @@ public abstract class Projectile extends Entity implements TraceableEntity {
@@ -2186,7 +2186,7 @@ index e2a0487089eb5a7bdc1433e4c75f69d8e9f9d5f9..d3cc65612c44f42ecae2e09b942438a0
      }
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 5453b7051337908ac1c8201827c1b5eec9e1608b..8ccd3b8fcaa80f60b91a6c066e312542d349246a 100644
+index 7c11853c5090fbc4fa5b3e73a69acf166158fdec..00987d0e1ee8a9541b0610616ace1c84d50e5f1a 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -86,6 +86,18 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
@@ -2218,7 +2218,7 @@ index 5453b7051337908ac1c8201827c1b5eec9e1608b..8ccd3b8fcaa80f60b91a6c066e312542
 
      // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
-index c3b1caa352b988ec44fa2b2eb0536517711f5460..2bd3c3ae836ada7261e81b96e8714b1d53d17495 100644
+index c3b1caa352b988ec44fa2b2eb0536517711f5460..a28366b8ed0da356dad6941e0a817d0b7ec43738 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunkSection.java
 @@ -22,6 +22,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.block_
@@ -2245,14 +2245,14 @@ index c3b1caa352b988ec44fa2b2eb0536517711f5460..2bd3c3ae836ada7261e81b96e8714b1d
          }
 
          // Paper start - block counting
-@@ -199,6 +202,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.block_
-                     for (int i = 0; i < paletteCount; ++i) {
-                         this.tickingBlocks.add(raw[i], state);
+@@ -208,6 +211,7 @@ public class LevelChunkSection implements ca.spottedleaf.moonrise.patches.block_
+                     if (fluid.isRandomlyTicking()) {
+                         this.tickingFluidCount += paletteCount;
                      }
-+                this.fluidStateCount++; // Pufferfish
++                    this.fluidStateCount++; // Pufferfish
                  }
-
-                 final FluidState fluid = state.getFluidState();
+             }
+         }
 diff --git a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java b/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
 index d8b4196adf955f8d414688dc451caac2d9c609d9..80a43def4912a3228cd95117d5c2aac68798b4ec 100644
 --- a/src/main/java/net/minecraft/world/level/entity/EntityTickList.java
@@ -2478,7 +2478,7 @@ index 96d772eb02f79f8c478f5e6f065e387aa7665b18..c5ce412f321b8b4f31cc042893659e21
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 41c34ffdf9d95a04ed55a1e09ebc78e8cf946777..00918d92a4105cc82a4d871423e516939cad951f 100644
+index 28dbe30a98a6730839949bc9a6a90b78619ff84d..65e27259c3a44512f395b750e93226bb36743ff5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -487,7 +487,7 @@ public final class CraftMagicNumbers implements UnsafeValues {