Update Paper

LeavesMC · Nov 15, 2024 · fd9bd9b · fd9bd9b
1 parent 257dd23
commit fd9bd9b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 group=org.leavesmc.leaves
 version=1.21.1-R0.1-SNAPSHOT
 mcVersion=1.21.1
-paperRef=d348cb88a9fe8d19e46102c8b9febe18f746d46b
+paperRef=84281ceeefb9d294758a9a292ba6c01da40e8409
 preVersion=false
 updatingMinecraft=false
 org.gradle.jvmargs=-Xmx2G

diff --git a/patches/server/0003-Delete-Timings.patch b/patches/server/0003-Delete-Timings.patch
@@ -1331,7 +1331,7 @@ index f9abf63e12ea930275121b470e4e4906cff0fc12..14e9140c9a18906c249e8cef39988ed7
          // Paper start - add close param
          if (close) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 5e2c4969e77c669acbb4a13c07033cb267c3d586..79237a490d7572eae95384f32e0ebc1a0a005c00 100644
+index b0e8fe11e7f5d1fd803fa34187c9fa77245ad79b..aca89b47378c4d1b2f3f3805cf743f6d838487c5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1,6 +1,5 @@
@@ -1519,7 +1519,7 @@ index 507671476c3d2d92a2fdb05be24443af27d26dcf..73b1b5b8b3723f068e45874eb251f08e
          this.spigotConfig.currentPrimedTnt = 0; // Spigot
      }
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index e524b27d185da3e88668f8ef107517272860bd66..8205d34ed80781b2aab1fb2ef59986b9370f0198 100644
+index 743a33ae2814c513b84b1a60e50a3c24527568f8..8af3f6c47e05968e7e5c461c3a1607ef45a700a4 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -128,7 +128,6 @@ public final class NaturalSpawner {
@@ -1530,7 +1530,7 @@ index e524b27d185da3e88668f8ef107517272860bd66..8205d34ed80781b2aab1fb2ef59986b9
          MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
          int i = aenumcreaturetype.length;
 
-@@ -181,7 +180,6 @@ public final class NaturalSpawner {
+@@ -180,7 +179,6 @@ public final class NaturalSpawner {
              }
          }
 
@@ -1752,7 +1752,7 @@ index d06aab9bd5cd901c8367f9680f5d27ddb17b3dc4..0d8a128b0506b903e2cc200d6e684fd5
      // Paper end
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index bf2d18f74b0f0da7c3c30310c74224a1c0853564..621bda8248e35f5a5730f89a4bcfbe6615ed969c 100644
+index c7efdd1483b309ed8121e2203216ab288daa3117..dfcb161a77e9a7cce6488d24815cb82ff520dfa2 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -34,7 +34,6 @@ import net.minecraft.world.entity.projectile.FireworkRocketEntity;

diff --git a/patches/server/0062-Spawn-ignore-lc.patch b/patches/server/0062-Spawn-ignore-lc.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Spawn ignore lc
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index c5b26fdb173a59280e790a5d5a687e0c0114bb74..7cb97b7623b603aa5469c92f5a6816673c994540 100644
+index 63ca6becabdd12a61b7ce5b6046bfb7c72a5bf56..595f2480a61c9f8d3aa66667b93a1f0e90e7a7ac 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-@@ -199,6 +199,19 @@ public final class NaturalSpawner {
+@@ -198,6 +198,19 @@ public final class NaturalSpawner {
      }
      public static int spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner, int maxSpawns, Consumer<Entity> trackEntity) {
          // Paper end - Optional per player mob spawns
@@ -28,7 +28,7 @@ index c5b26fdb173a59280e790a5d5a687e0c0114bb74..7cb97b7623b603aa5469c92f5a681667
          BlockPos blockposition = NaturalSpawner.getRandomPosWithin(world, chunk);
 
          if (blockposition.getY() >= world.getMinBuildHeight() + 1) {
-@@ -207,6 +220,16 @@ public final class NaturalSpawner {
+@@ -206,6 +219,16 @@ public final class NaturalSpawner {
          return 0; // Paper - Optional per player mob spawns
      }