Skip to content

Commit 803bf62

Browse files
committed
Final 1.21.1 Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7f7bc17 Fix inactive item ticking and remove active tick skipping; fix quit event leave message PaperMC/Paper@4d2672e Fix the fix PaperMC/Paper@84281ce Don't count mobs twice in per-player-mob-spawns
1 parent d49ca07 commit 803bf62

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.21.1-R0.1-SNAPSHOT
33

44
mcVersion = 1.21.1
5-
paperCommit = d348cb88a9fe8d19e46102c8b9febe18f746d46b
5+
paperCommit = 84281ceeefb9d294758a9a292ba6c01da40e8409
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

patches/server/0252-Remove-Timings.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ index bfc36c239dab4df5130cbde190d513655b9f12a1..b6fd5b83cff5ea21221d029b8729932e
510510

511511
}
512512
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
513-
index c55f721a611dc215bcbf3f74f752b3bebfbe9ea4..0ea07da1b4bd420cd6765577b4719a2368b5740c 100644
513+
index 76fe57670dbb97103041c89d68653918b9023ef5..33b7f0f14c826e9baa8b562a852cd4d46882622c 100644
514514
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
515515
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
516516
@@ -1238,7 +1238,7 @@ public abstract class PlayerList {
@@ -613,7 +613,7 @@ index 7bc1d9ed3a3e3679caff8da0a38a3de93fc9ebac..ccc6204141298deea56d996fab24254d
613613
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
614614
gameprofilerfiller.pop();
615615
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
616-
index e524b27d185da3e88668f8ef107517272860bd66..735f39fed209e086a52185565f8bd6873c0b8d6e 100644
616+
index 743a33ae2814c513b84b1a60e50a3c24527568f8..638ea34a7e93426ea67d4268dbedc08ad8f681ec 100644
617617
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
618618
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
619619
@@ -128,7 +128,7 @@ public final class NaturalSpawner {
@@ -625,7 +625,7 @@ index e524b27d185da3e88668f8ef107517272860bd66..735f39fed209e086a52185565f8bd687
625625
MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
626626
int i = aenumcreaturetype.length;
627627

628-
@@ -181,7 +181,7 @@ public final class NaturalSpawner {
628+
@@ -180,7 +180,7 @@ public final class NaturalSpawner {
629629
}
630630
}
631631

@@ -752,7 +752,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..d3ec817e95628f1fc8be4a29c9a0f13c
752752
// Paper end - add timings for scoreboard search
753753
}
754754
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
755-
index ba180127a50b1a1ed155ee4053440074e38adef4..ed1cdea66dd117ecafd14a52727f094430f39b60 100644
755+
index 1eafc16b3a04d69cf20a70a478a428bf61356827..d7ea83c912424d42905fbafe5ad5573b7cd23ecc 100644
756756
--- a/src/main/java/org/spigotmc/ActivationRange.java
757757
+++ b/src/main/java/org/spigotmc/ActivationRange.java
758758
@@ -171,7 +171,7 @@ public class ActivationRange

patches/server/0253-Remove-Mojang-Profiler.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ index ccc6204141298deea56d996fab24254d25857da5..5057d9d433ba002a22d22adfaf7323b2
19151915
}
19161916

19171917
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
1918-
index 735f39fed209e086a52185565f8bd6873c0b8d6e..4dc060bc677984d91a30a88155c576d5e187aa1b 100644
1918+
index 638ea34a7e93426ea67d4268dbedc08ad8f681ec..86eeae25fe93ddbe3a7026c06d2d3ea5bc55feb4 100644
19191919
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
19201920
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
19211921
@@ -127,7 +127,7 @@ public final class NaturalSpawner {
@@ -1927,7 +1927,7 @@ index 735f39fed209e086a52185565f8bd6873c0b8d6e..4dc060bc677984d91a30a88155c576d5
19271927
//world.timings.mobSpawn.startTiming(); // Spigot // Purpur
19281928
MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
19291929
int i = aenumcreaturetype.length;
1930-
@@ -182,7 +182,7 @@ public final class NaturalSpawner {
1930+
@@ -181,7 +181,7 @@ public final class NaturalSpawner {
19311931
}
19321932

19331933
//world.timings.mobSpawn.stopTiming(); // Spigot // Purpur

patches/server/0257-mob-spawning-option-to-ignore-creative-players.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] mob spawning option to ignore creative players
55

66

77
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
8-
index 4dc060bc677984d91a30a88155c576d5e187aa1b..061706ee732f9809d6b73305c14871257af8305e 100644
8+
index 86eeae25fe93ddbe3a7026c06d2d3ea5bc55feb4..1ccd314b7ce42e7660ab220cf020e9e1c5ca90d3 100644
99
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
1010
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
11-
@@ -253,7 +253,7 @@ public final class NaturalSpawner {
11+
@@ -252,7 +252,7 @@ public final class NaturalSpawner {
1212
blockposition_mutableblockposition.set(l, i, i1);
1313
double d0 = (double) l + 0.5D;
1414
double d1 = (double) i1 + 0.5D;

0 commit comments

Comments
 (0)