update patches after removal of verify-merges flag

4 files changed, 12 insertions, 12 deletions

diff --git a/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch b/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
index cc53c02b77..2c28da3a05 100644
--- a/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
+++ b/patches/server/0382-Fix-missing-chunks-due-to-integer-overflow.patch
@@ -15,7 +15,7 @@ allows the distance calculation to avoid overflow and work as intended.
 This issue is being tracked in Mojira ticket MC-159283
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
-index ed4882fc82c97378b3512182c69e8a56fc74aea8..08165e84c0b8db7495bb66605bc73a269dd5152f 100644
+index db1d0e5cec19059d14e1a7cd41f049d23600e3fe..92c2df6a6abd9c60e90b0b84ab66987557adb9c8 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
 @@ -521,7 +521,7 @@ public final class DensityFunctions {
@@ -24,6 +24,6 @@ index ed4882fc82c97378b3512182c69e8a56fc74aea8..08165e84c0b8db7495bb66605bc73a26
              int l = z % 2;
 -            float f = 100.0F - Mth.sqrt((float)(x * x + z * z)) * 8.0F;
 +            float f = 100.0F - Mth.sqrt((long) x * (long) x + (long) z * (long) z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
-             float var18 = Mth.clamp(f, -100.0F, 80.0F);
+             f = Mth.clamp(f, -100.0F, 80.0F);
  
              for (int m = -12; m <= 12; m++) {
diff --git a/patches/server/0409-Fix-some-rails-connecting-improperly.patch b/patches/server/0409-Fix-some-rails-connecting-improperly.patch
index e75b5f296c..95fe65653d 100644
--- a/patches/server/0409-Fix-some-rails-connecting-improperly.patch
+++ b/patches/server/0409-Fix-some-rails-connecting-improperly.patch
@@ -5,17 +5,17 @@ Subject: [PATCH] Fix some rails connecting improperly
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
-index 0483ff1b10bc733ffbfe75ef3a2527c3fed90b8a..b62d77c9aa44447de698ffacf26e0b821c7e11c3 100644
+index e9fbbca04105370226bf5a264ba6ea96e09c3f10..93398cf061a8609f0b77a5e7f8340870019b9824 100644
 --- a/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BaseRailBlock.java
 @@ -68,6 +68,7 @@ public abstract class BaseRailBlock extends Block implements SimpleWaterloggedBl
-         BlockState var5 = this.updateDir(world, pos, state, true);
+         state = this.updateDir(world, pos, state, true);
          if (this.isStraight) {
-             world.neighborChanged(var5, pos, this, pos, notify);
-+            var5 = world.getBlockState(pos); // Paper - Fix some rails connecting improperly
+             world.neighborChanged(state, pos, this, pos, notify);
++            state = world.getBlockState(pos); // Paper - Fix some rails connecting improperly
          }
  
-         return var5;
+         return state;
 diff --git a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java b/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
 index 41452abc7b761858ff2f3ff6a833b09c16fded4f..17242c24d73c9ffb1c976a45925f85d1aa9e96b3 100644
 --- a/src/main/java/net/minecraft/world/level/block/DetectorRailBlock.java
diff --git a/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
index dfab509fb3..ddb86100e5 100644
--- a/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
+++ b/patches/server/0458-Significantly-improve-performance-of-the-end-generat.patch
@@ -12,7 +12,7 @@ Co-authored-by: Dylan Xaldin <[email protected]>
 Co-authored-by: pop4959 <[email protected]>
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
-index 08165e84c0b8db7495bb66605bc73a269dd5152f..53db6d27c8d7daa7530435f953af8bd7b884a317 100644
+index 92c2df6a6abd9c60e90b0b84ab66987557adb9c8..d5dccab8020e31f818420b8ee59c6d3928f1dfff 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/DensityFunctions.java
 @@ -509,6 +509,16 @@ public final class DensityFunctions {
@@ -34,7 +34,7 @@ index 08165e84c0b8db7495bb66605bc73a269dd5152f..53db6d27c8d7daa7530435f953af8bd7
              RandomSource randomSource = new LegacyRandomSource(seed);
 @@ -524,12 +534,26 @@ public final class DensityFunctions {
              float f = 100.0F - Mth.sqrt((long) x * (long) x + (long) z * (long) z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
-             float var18 = Mth.clamp(f, -100.0F, 80.0F);
+             f = Mth.clamp(f, -100.0F, 80.0F);
  
 +            NoiseCache cache = noiseCache.get().computeIfAbsent(sampler, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation
              for (int m = -12; m <= 12; m++) {
diff --git a/patches/server/0849-Fix-text-display-error-on-spawn.patch b/patches/server/0849-Fix-text-display-error-on-spawn.patch
index 6dc3644125..5ee377452f 100644
--- a/patches/server/0849-Fix-text-display-error-on-spawn.patch
+++ b/patches/server/0849-Fix-text-display-error-on-spawn.patch
@@ -5,15 +5,15 @@ Subject: [PATCH] Fix text display error on spawn
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Display.java b/src/main/java/net/minecraft/world/entity/Display.java
-index 622ec8aa412bca354e6a14693e0d19a941cf4c1b..cad5104baf9941f69d4a6935c0a210942b0f84f2 100644
+index 4a9aad128c884d659f42f5d6b35e2d7147c4bc17..bba45aa7ba4fa578344ec2b9dfa552097770a59f 100644
 --- a/src/main/java/net/minecraft/world/entity/Display.java
 +++ b/src/main/java/net/minecraft/world/entity/Display.java
 @@ -899,7 +899,7 @@ public abstract class Display extends Entity {
-             byte var10 = loadFlag(b, nbt, "default_background", (byte)4);
+             b = loadFlag(b, nbt, "default_background", (byte)4);
              Optional<Display.TextDisplay.Align> optional = Display.TextDisplay.Align.CODEC
                  .decode(NbtOps.INSTANCE, nbt.get("alignment"))
 -                .resultOrPartial(Util.prefix("Display entity", Display.LOGGER::error))
 +                .result() // Paper - Hide text display error on spawn
                  .map(Pair::getFirst);
              if (optional.isPresent()) {
-                 var10 = switch ((Display.TextDisplay.Align)optional.get()) {
+                 b = switch ((Display.TextDisplay.Align)optional.get()) {