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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c032050 Fix command preprocess cancelling and command changing
PaperMC/Paper@7044a9c Leave a paper.yml.txt stub pointing to new location (#8090)
PaperMC/Paper@4a00cee Readd patch to remove invalid signature on login error
PaperMC/Paper@a817697 Add async catcher to PlayerConnection internalTeleport
PaperMC/Paper@ef42d2a Fix null profile key breaking nullability contracts for PlayerProfile API (#8233)
PaperMC/Paper@3af906b Updated Upstream (Bukkit)
PaperMC/Paper@18a0337 [ci skip] Fix grammatical error in README. (#8189)
PaperMC/Paper@69950d5 Block Ticking API (#7202)
This commit is contained in:
BillyGalbreath
2022-08-04 08:15:54 -05:00
parent e3f739bafd
commit 1fce5dad36
12 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur
version = 1.19.1-R0.1-SNAPSHOT
paperCommit = e0486ae2cde50eaa51de09c81c367f85d46f990e
paperCommit = 69950d5a6a22908368bf081c5006ec36d176fd14
org.gradle.caching = true
org.gradle.parallel = true

4
patches/server/0001-Pufferfish-Server-Changes.patch
View File

@@ -3202,7 +3202,7 @@ index 083349794d5ceb50322c5a645dd33fbfcc1c8155..f58873ef4362bfcc618ead099be94ba2
this.getRandomBlockPosition(j, 0, k, 15, blockposition);
int normalY = chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, blockposition.getX() & 15, blockposition.getZ() & 15) + 1;
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..a526b7a8789693c5c24fcf1233183ea317a938d8 100644
index 2fab929b6775238d031ca3305b61af3cbe920a06..c74a7b993a2e0bc0b993b269b90926b2e3673fe7 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1219,6 +1219,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3213,7 +3213,7 @@ index a68b737cdd1e9f1054e0fc3bfee92c20a062fab5..a526b7a8789693c5c24fcf1233183ea3
// Paper start
if (!this.cserver.isPrimaryThread()) {
List<String> pageList = packet.getPages();
@@ -2353,6 +2354,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2372,6 +2373,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private boolean updateChatOrder(Instant timestamp) {

6
patches/server/0005-Purpur-client-support.patch
View File

@@ -17,10 +17,10 @@ index 6cbd839cc7529eb0095485c4ef4a0d81a3cd9b19..3f38159b6a6564ec6b7e01efbdc38d32
public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks
public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a526b7a8789693c5c24fcf1233183ea317a938d8..904ad8ae42dac7077d5648dac317424742c63652 100644
index c74a7b993a2e0bc0b993b269b90926b2e3673fe7..c074daa9cfa60035e6e9778df27c9f41f7085a0e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3625,6 +3625,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3644,6 +3644,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister");
private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support
@@ -28,7 +28,7 @@ index a526b7a8789693c5c24fcf1233183ea317a938d8..904ad8ae42dac7077d5648dac3174247
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3649,6 +3650,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3668,6 +3669,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex);
this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause
}

4
patches/server/0008-Ridables.patch
View File

@@ -66,10 +66,10 @@ index cbb79f16d7e996b264ba95eb6f59db7095e6089e..1628989f81e76fc61b2a894f7037f563
public void doTick() {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 904ad8ae42dac7077d5648dac317424742c63652..3da6eb36490f15ecccf9d93d8ec2c1a58646b722 100644
index c074daa9cfa60035e6e9778df27c9f41f7085a0e..33ec7ca690cf1400f6b1fcbfa44686f790f97ec3 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2898,6 +2898,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2917,6 +2917,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);

4
patches/server/0020-Player-invulnerabilities.patch
View File

@@ -82,10 +82,10 @@ index c72b20e3e7eda999c6da07e7e6fb46826c4369a9..481e474f48d9409f4d8a337b334a1762
public Scoreboard getScoreboard() {
return this.getBukkitEntity().getScoreboard().getHandle();
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 8b2c0e87a8bc51fe5c8d2494330766ea478145bf..63b7130f287774696bb6d7849f4792772329c65a 100644
index 094698b4bf0546704d5ade47a17988474344d244..9eef5e10a4528e56080f4bc1438b483304720a4f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2101,12 +2101,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2102,12 +2102,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());

4
patches/server/0023-Alternative-Keepalive-Handling.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 63b7130f287774696bb6d7849f4792772329c65a..34e07a31d70854b8ed8a955f296b9e4e5da6cedc 100644
index 9eef5e10a4528e56080f4bc1438b483304720a4f..b996a4903fcbaf308ff141b9c05d516832fcee47 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -258,6 +258,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -38,7 +38,7 @@ index 63b7130f287774696bb6d7849f4792772329c65a..34e07a31d70854b8ed8a955f296b9e4e
if (this.keepAlivePending) {
if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected
ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info
@@ -3610,6 +3626,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3629,6 +3645,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

4
patches/server/0079-Entity-lifespan.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 28146fe7c892c42dd187fc6163eed4ae5ff204ec..0d110bed21eda6f8c28a495aa7b88fac786f47d8 100644
index 0f90a7be083723e72dc6f24087f981790dd98eec..666c5b9792da335bc85a964b15296fcecbf4d43f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2953,6 +2953,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2972,6 +2972,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {

4
patches/server/0228-Shift-right-click-to-use-exp-for-mending.patch
View File

@@ -36,10 +36,10 @@ index 28463bca77d62ad9175a55cffc92110ffa16fadc..bd77301ef6cde21e1ee1966d2ffa4186
+ // Purpur end
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ead6b7246b142304dc52cdd3157a0b113645c641..08531e031ecad8d38cff2701fd31e70b47ed3357 100644
index 72422e08da8bb07181b777b073d12b0c87e2b8ea..aa18ee0cb53f527c0043cdbf39d3848c6f660b8b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2097,6 +2097,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2098,6 +2098,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
boolean cancelled;
if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {

4
patches/server/0239-Signs-allow-color-codes.patch
View File

@@ -17,10 +17,10 @@ index 3133b14e2fcef91cf3a72b5f65102aef43b92459..dd4c1c3cd907b943ab1740d0c9de8652
this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos()));
this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos()));
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 08531e031ecad8d38cff2701fd31e70b47ed3357..ac5be834a5b772bd82823a54b49fcb54af848806 100644
index aa18ee0cb53f527c0043cdbf39d3848c6f660b8b..0c65d3249baf2b6a168312e74b6e513e388900db 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3634,11 +3634,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3653,11 +3653,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
for (int i = 0; i < signText.size(); ++i) {
FilteredText filteredtext = (FilteredText) signText.get(i);

4
patches/server/0276-Add-log-suppression-for-sent-expired-chat.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Add log suppression for sent expired chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index ac5be834a5b772bd82823a54b49fcb54af848806..e3b48fea4a8b03f2b74b910289640542bce2cb94 100644
index 0c65d3249baf2b6a168312e74b6e513e388900db..f333d49b82cdbc62f1b46395417e1df2269f634f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2668,7 +2668,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2687,7 +2687,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.disconnect(Component.translatable("multiplayer.disconnect.unsigned_chat"), org.bukkit.event.player.PlayerKickEvent.Cause.UNSIGNED_CHAT); // Paper - kick event cause
return false;
} else {

4
patches/server/0280-Option-to-disable-kick-for-out-of-order-chat.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Option to disable kick for out of order chat
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index e3b48fea4a8b03f2b74b910289640542bce2cb94..9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e 100644
index f333d49b82cdbc62f1b46395417e1df2269f634f..ed4c5762a2fe70e6214fabe14ab5484866da8778 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2442,7 +2442,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2461,7 +2461,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
do {
instant1 = (Instant) this.lastChatTimeStamp.get();
if (timestamp.isBefore(instant1)) {

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

@@ -748,10 +748,10 @@ index c685e0acb2559e7415c94790d8392f0ee997ecc6..ad14dbed67ca622f9c8e05164104fe9a
this.entityManager.saveAll();
} else {
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472102a7697 100644
index ed4c5762a2fe70e6214fabe14ab5484866da8778..f0ce2e74a57ffbd9bf1aaf7535250c3862f351eb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2592,7 +2592,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2611,7 +2611,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@@ -760,7 +760,7 @@ index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2602,7 +2602,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2621,7 +2621,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@@ -769,7 +769,7 @@ index 9fa0dab0bb255d5ccb5b810449ee6f67f7774b8e..cc5adc1a6b6da4d95ea2b5e2f543d472
return;
}
@@ -2615,7 +2615,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2634,7 +2634,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
java.util.logging.Logger.getLogger(ServerGamePacketListenerImpl.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
return;
} finally {