Skip to content

Commit a0b716f

Browse files
grannygranny
committed
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f9edc4b Update paperweight to 1.5.11 PaperMC/Paper@2f92d4e Updated Upstream (Bukkit/CraftBukkit) PaperMC/Paper@8d8eb3b optimise explosion damage further PaperMC/Paper@7606e6d fixup tests and add missing API detected by those tests PaperMC/Paper@f17622c more cleanup and resource pack api fixes PaperMC/Paper@9051fc3 remove redundant patch
1 parent 2f003a6 commit a0b716f

20 files changed

Lines changed: 141 additions & 47 deletions

‎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.20.4-R0.1-SNAPSHOT
33

44
mcVersion = 1.20.4
5-
paperCommit = 930a24f965d02250fa58436c019a4d5eb7e5f607
5+
paperCommit = 9051fc347c428500090e814c98e9d8503dc7a205
66

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

‎patches/api/0003-Purpur-client-support.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur client support
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 962283d336e6d53941cebbc3a995d403ff989f66..f866628e5d9e8edccab657f86f60f911c2e3fb06 100644
8+
index a8d3451ccfcd21a9e80adc2feab8fc9c2926c753..271b3ee810f9689dab223eb0e6b51eef358ee38d 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3414,4 +3414,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3484,4 +3484,13 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
@Override
1313
Spigot spigot();
1414
// Spigot end

‎patches/api/0008-AFK-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] AFK API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index f866628e5d9e8edccab657f86f60f911c2e3fb06..e3a6289547ff378fecf97b20ab08c8b36fe9cfa6 100644
8+
index 271b3ee810f9689dab223eb0e6b51eef358ee38d..31b086d944fd06a518c49da84cbc58744591a2f9 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3422,5 +3422,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3492,5 +3492,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* @return True if Player uses Purpur Client
1313
*/
1414
public boolean usesPurpurClient();

‎patches/api/0042-Debug-Marker-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,10 @@ index 26fe07a4429e40da1ce4a0433ae184f594ddb473..405d60bd2c99ba741d2614b16f4bda5d
260260

261261
/**
262262
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
263-
index e3a6289547ff378fecf97b20ab08c8b36fe9cfa6..617d1ff6cfe1113668f4f91b5ed83016ad48c3f7 100644
263+
index 31b086d944fd06a518c49da84cbc58744591a2f9..2587fa1f34eb8ed6c50e500531d07f9325d91f16 100644
264264
--- a/src/main/java/org/bukkit/entity/Player.java
265265
+++ b/src/main/java/org/bukkit/entity/Player.java
266-
@@ -3442,5 +3442,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
266+
@@ -3512,5 +3512,75 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
267267
* @deprecated Use {@link #resetIdleDuration()} instead
268268
*/
269269
void resetIdleTimer();

‎patches/api/0043-Add-death-screen-API.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Add death screen API
55

66

77
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
8-
index 617d1ff6cfe1113668f4f91b5ed83016ad48c3f7..498f9d8bbda8ab248ec520d850c9169da4b00327 100644
8+
index 2587fa1f34eb8ed6c50e500531d07f9325d91f16..c70af6fb5789974b1f302d408021df6284f014a1 100644
99
--- a/src/main/java/org/bukkit/entity/Player.java
1010
+++ b/src/main/java/org/bukkit/entity/Player.java
11-
@@ -3512,5 +3512,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
11+
@@ -3582,5 +3582,25 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
1212
* Clears all debug block highlights
1313
*/
1414
void clearBlockHighlights();

‎patches/server/0003-Purpur-client-support.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ index 8efbbd379244e3ed54d4aba199037cc20ccd096a..86cf69de7a35f1ac8e2c56f988e74832
1717
// Paper start - replace player chunk loader
1818
private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
1919
diff --git a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
20-
index 77cd2b73e4d499beca16962a6b3d1fefe279cd87..13e064451c4d48e873061b6dea431a6b101de2ee 100644
20+
index 4a712f5fc4f0b4a4434ae808c989113bee8d8634..fb03498b355a86e156ed26ee903ba93c03365dcb 100644
2121
--- a/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
2222
+++ b/src/main/java/net/minecraft/server/network/ServerCommonPacketListenerImpl.java
2323
@@ -55,6 +55,7 @@ public abstract class ServerCommonPacketListenerImpl implements ServerCommonPack
@@ -43,10 +43,10 @@ index 77cd2b73e4d499beca16962a6b3d1fefe279cd87..13e064451c4d48e873061b6dea431a6b
4343
try {
4444
String channels = payload.toString(com.google.common.base.Charsets.UTF_8);
4545
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
46-
index ed41decbf0522c516b3608569d5719687105e25b..67bb2541fff19f0a48c7b1289e34749ece632d56 100644
46+
index 036b31cbfda8bac02205d99c1eff8a08f4da1250..ef9b8e50522583aa9675ab4d15fc8285a311e2ec 100644
4747
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
4848
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
49-
@@ -3315,4 +3315,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
49+
@@ -3293,4 +3293,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
5050
return this.spigot;
5151
}
5252
// Spigot end

‎patches/server/0004-Fix-decompile-errors.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ Date: Sun, 12 Jun 2022 06:20:21 -0500
44
Subject: [PATCH] Fix decompile errors
55

66

7+
diff --git a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
8+
index 89f0f68b3e2be64bcbf8b173a51d56ea3a3fb4ea..05e1c94268cf5c6897807cd7acced652856a09ea 100644
9+
--- a/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
10+
+++ b/src/main/java/net/minecraft/commands/execution/tasks/BuildContexts.java
11+
@@ -94,7 +94,7 @@ public class BuildContexts<T extends ExecutionCommandSource<T>> {
12+
13+
if (list.isEmpty()) {
14+
if (chainModifiers.isReturn()) {
15+
- context.queueNext(new CommandQueueEntry<>(frame, FallthroughTask.instance()));
16+
+ context.queueNext(new CommandQueueEntry<>(frame, (EntryAction<T>) FallthroughTask.instance())); // Purpur - decompile error
17+
}
18+
19+
} else {
720
diff --git a/src/main/java/net/minecraft/world/entity/decoration/Painting.java b/src/main/java/net/minecraft/world/entity/decoration/Painting.java
821
index d9016807bc21c38a5c38170e1335c79b39355bcb..03c065d0ad97d29f3586ba2bf3cd207b867ed634 100644
922
--- a/src/main/java/net/minecraft/world/entity/decoration/Painting.java
@@ -30,6 +43,19 @@ index b79c86272f12c4b1173ea494cbe09e1ecdc23533..11275a9ec6faa69c9f054683cb47312e
3043
}
3144

3245
protected void updateActivity() {
46+
diff --git a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
47+
index 0b8992a9aea781470ab3b1880cf041972a20089d..ab183a7d94a27d5235ff33ce7784c92d66d40b89 100644
48+
--- a/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
49+
+++ b/src/main/java/net/minecraft/world/entity/monster/breeze/Breeze.java
50+
@@ -59,7 +59,7 @@ public class Breeze extends Monster {
51+
52+
@Override
53+
public Brain<Breeze> getBrain() {
54+
- return super.getBrain();
55+
+ return (Brain<Breeze>) super.getBrain(); // Purpur - decompile error
56+
}
57+
58+
@Override
3359
diff --git a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java b/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java
3460
index d02ee11066fc4f07ccb110b09b86d895ff90d4f2..e1be4a77fae0b9120781f460079269b85c993930 100644
3561
--- a/src/main/java/net/minecraft/world/entity/monster/piglin/PiglinBrute.java

‎patches/server/0006-Ridables.patch‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ index 88b79cd90e936e1c48b84d7f762f425e1ae09259..81e4b7254e1c3cb714a9c37d941ff1b5
3434
this.profiler.push(() -> {
3535
return worldserver + " " + worldserver.dimension().location();
3636
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
37-
index f4d53d9bfe5b060158f69b5d9e4533a5b9869eed..35cc427755cccb123a866220bd2a72cdbd723465 100644
37+
index b78a9628a88f2a495ef6de74446a02a14d41a1f6..d328cc90fc6e333ea3079e462046a017a6cfc6f8 100644
3838
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
3939
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
4040
@@ -225,6 +225,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -66,10 +66,10 @@ index b0e698b2532ed6af84ca2dd0d8b1c795921c5823..d5940e560ea890f7f017ff9c37939a48
6666

6767
public void doTick() {
6868
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
69-
index 9a94249834f8b0b8d3f6aeaf0c859ba875079250..0ade0256c3a227ea6a2971b2c5889b9935d52259 100644
69+
index 9073db9ad3627633f46314ae936d584fa400a9ce..41f3415c6c1b7a3ee2c733445bfefdc51089ecb5 100644
7070
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
7171
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
72-
@@ -2720,6 +2720,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
72+
@@ -2714,6 +2714,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
7373

7474
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
7575

‎patches/server/0010-AFK-API.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ index d5940e560ea890f7f017ff9c37939a485be94540..f862bd65b535fc9e289b31260af69907
7878
return this.stats;
7979
}
8080
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
81-
index 0ade0256c3a227ea6a2971b2c5889b9935d52259..34a369dd615c4701d1bfb66a51623eab8e0b3080 100644
81+
index 41f3415c6c1b7a3ee2c733445bfefdc51089ecb5..de9d79c5e83ccce5f6fc585435e18a481d790f38 100644
8282
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8383
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8484
@@ -326,6 +326,20 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
@@ -223,10 +223,10 @@ index aaa07fcd4b32fe0de88142ab30378327a01f1729..bc8555d21d418f9da37cc089904f7cb0
223223
if (range < 0.0D || d < range * range) {
224224
return true;
225225
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
226-
index 67bb2541fff19f0a48c7b1289e34749ece632d56..62e5bdd889392f6e2da73d093ff77ac355a4ea3c 100644
226+
index ef9b8e50522583aa9675ab4d15fc8285a311e2ec..54e2b4b116eadb1fdce15e4aee8e97d60fa2c8db 100644
227227
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
228228
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
229-
@@ -531,10 +531,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
229+
@@ -527,10 +527,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
230230

231231
@Override
232232
public void setPlayerListName(String name) {
@@ -243,7 +243,7 @@ index 67bb2541fff19f0a48c7b1289e34749ece632d56..62e5bdd889392f6e2da73d093ff77ac3
243243
for (ServerPlayer player : (List<ServerPlayer>) this.server.getHandle().players) {
244244
if (player.getBukkitEntity().canSee(this)) {
245245
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
246-
@@ -3321,5 +3326,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
246+
@@ -3299,5 +3304,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
247247
public boolean usesPurpurClient() {
248248
return getHandle().purpurClient;
249249
}

‎patches/server/0070-Entity-lifespan.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index 2d29caa16c754b06cbfe91038b673668a1b61d02..c58ede27583fa14fffcc8554d58bb47a94886e40 100644
8+
index 22e0370498dac0f56e29ae483097bf453a277450..224e0453fc51224e8a4937a1d089053e54b6f9e0 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11-
@@ -2747,6 +2747,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
11+
@@ -2741,6 +2741,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
1212
AABB axisalignedbb = entity.getBoundingBox();
1313

1414
if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {

0 commit comments

Comments
 (0)