Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Final 1.21.1 Upstream (Paper)

Browse Source 
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
This commit is contained in:
granny
2024-10-31 13:20:49 -07:00
parent d49ca07e00
commit 803bf624d9
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.21.1-R0.1-SNAPSHOT version = 1.21.1-R0.1-SNAPSHOT
mcVersion = 1.21.1 mcVersion = 1.21.1
paperCommit = d348cb88a9fe8d19e46102c8b9febe18f746d46b paperCommit = 84281ceeefb9d294758a9a292ba6c01da40e8409
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

8
patches/server/0252-Remove-Timings.patch
View File

@@ -510,7 +510,7 @@ index bfc36c239dab4df5130cbde190d513655b9f12a1..b6fd5b83cff5ea21221d029b8729932e
} }
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c55f721a611dc215bcbf3f74f752b3bebfbe9ea4..0ea07da1b4bd420cd6765577b4719a2368b5740c 100644 index 76fe57670dbb97103041c89d68653918b9023ef5..33b7f0f14c826e9baa8b562a852cd4d46882622c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java --- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1238,7 +1238,7 @@ public abstract class PlayerList { @@ -1238,7 +1238,7 @@ public abstract class PlayerList {
@@ -613,7 +613,7 @@ index 7bc1d9ed3a3e3679caff8da0a38a3de93fc9ebac..ccc6204141298deea56d996fab24254d
co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper co.aikar.timings.TimingHistory.tileEntityTicks += this.blockEntityTickers.size(); // Paper
gameprofilerfiller.pop(); gameprofilerfiller.pop();
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index e524b27d185da3e88668f8ef107517272860bd66..735f39fed209e086a52185565f8bd6873c0b8d6e 100644 index 743a33ae2814c513b84b1a60e50a3c24527568f8..638ea34a7e93426ea67d4268dbedc08ad8f681ec 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -128,7 +128,7 @@ public final class NaturalSpawner { @@ -128,7 +128,7 @@ public final class NaturalSpawner {
@@ -625,7 +625,7 @@ index e524b27d185da3e88668f8ef107517272860bd66..735f39fed209e086a52185565f8bd687
MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES; MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
int i = aenumcreaturetype.length; int i = aenumcreaturetype.length;
@@ -181,7 +181,7 @@ public final class NaturalSpawner { @@ -180,7 +180,7 @@ public final class NaturalSpawner {
} }
} }
@@ -752,7 +752,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..d3ec817e95628f1fc8be4a29c9a0f13c
// Paper end - add timings for scoreboard search // Paper end - add timings for scoreboard search
} }
diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
index ba180127a50b1a1ed155ee4053440074e38adef4..ed1cdea66dd117ecafd14a52727f094430f39b60 100644 index 1eafc16b3a04d69cf20a70a478a428bf61356827..d7ea83c912424d42905fbafe5ad5573b7cd23ecc 100644
--- a/src/main/java/org/spigotmc/ActivationRange.java --- a/src/main/java/org/spigotmc/ActivationRange.java
+++ b/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -171,7 +171,7 @@ public class ActivationRange @@ -171,7 +171,7 @@ public class ActivationRange

4
patches/server/0253-Remove-Mojang-Profiler.patch
View File

@@ -1915,7 +1915,7 @@ index ccc6204141298deea56d996fab24254d25857da5..5057d9d433ba002a22d22adfaf7323b2
} }
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 735f39fed209e086a52185565f8bd6873c0b8d6e..4dc060bc677984d91a30a88155c576d5e187aa1b 100644 index 638ea34a7e93426ea67d4268dbedc08ad8f681ec..86eeae25fe93ddbe3a7026c06d2d3ea5bc55feb4 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -127,7 +127,7 @@ public final class NaturalSpawner { @@ -127,7 +127,7 @@ public final class NaturalSpawner {
@@ -1927,7 +1927,7 @@ index 735f39fed209e086a52185565f8bd6873c0b8d6e..4dc060bc677984d91a30a88155c576d5
//world.timings.mobSpawn.startTiming(); // Spigot // Purpur //world.timings.mobSpawn.startTiming(); // Spigot // Purpur
MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES; MobCategory[] aenumcreaturetype = NaturalSpawner.SPAWNING_CATEGORIES;
int i = aenumcreaturetype.length; int i = aenumcreaturetype.length;
@@ -182,7 +182,7 @@ public final class NaturalSpawner { @@ -181,7 +181,7 @@ public final class NaturalSpawner {
} }
//world.timings.mobSpawn.stopTiming(); // Spigot // Purpur //world.timings.mobSpawn.stopTiming(); // Spigot // Purpur

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

@@ -5,10 +5,10 @@ Subject: [PATCH] mob spawning option to ignore creative players
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
index 4dc060bc677984d91a30a88155c576d5e187aa1b..061706ee732f9809d6b73305c14871257af8305e 100644 index 86eeae25fe93ddbe3a7026c06d2d3ea5bc55feb4..1ccd314b7ce42e7660ab220cf020e9e1c5ca90d3 100644
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
@@ -253,7 +253,7 @@ public final class NaturalSpawner { @@ -252,7 +252,7 @@ public final class NaturalSpawner {
blockposition_mutableblockposition.set(l, i, i1); blockposition_mutableblockposition.set(l, i, i1);
double d0 = (double) l + 0.5D; double d0 = (double) l + 0.5D;
double d1 = (double) i1 + 0.5D; double d1 = (double) i1 + 0.5D;