mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08: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@0ddd20c Updated Upstream (CraftBukkit/Spigot)
PaperMC/Paper@9592da1 Add method to get highest anger level of warden
This commit is contained in:
BillyGalbreath 2022-08-14 04:43:41 -05:00
parent 0fd6a5698f
commit ac5c303a0d
No known key found for this signature in database
GPG Key ID: 1968A5C4D57BB3FA
23 changed files with 89 additions and 89 deletions
Show Stats 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.2-R0.1-SNAPSHOT
paperCommit = 3f0415b45303568fe5d362dc3fa27b3a4ca680eb
paperCommit = 9592da1f84db1565bc67072504a30f488cf782e0
org.gradle.caching = true
org.gradle.parallel = true

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

@ -2783,7 +2783,7 @@ index 7034af8ad42940c5af6b9032b9873ce36c55a2a7..c0fdc5a79107f8694a514a12d5526bd4
public static long getCoordinateKey(final ChunkPos pair) {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 081c7160cf727646cdec4cd551dbc2aad56326f6..06d31a03ec7d049649e94d013429d2197b697545 100644
index dd9ab51e904be2f2f2a2981d4f0f6638a6895e8d..e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,6 +298,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -2795,7 +2795,7 @@ index 081c7160cf727646cdec4cd551dbc2aad56326f6..06d31a03ec7d049649e94d013429d219
public static <S extends MinecraftServer> S spin(Function<Thread, S> serverFactory) {
AtomicReference<S> atomicreference = new AtomicReference();
@@ -1656,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1672,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -2804,7 +2804,7 @@ index 081c7160cf727646cdec4cd551dbc2aad56326f6..06d31a03ec7d049649e94d013429d219
}
public SystemReport fillSystemReport(SystemReport details) {
@@ -2235,6 +2237,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2251,6 +2253,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@ -3145,7 +3145,7 @@ index 3b144c820531122eb37d41be06c182b5f5dc0724..88152988425b7b02ec5ce229ba4c24b4
set.clear();
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 083349794d5ceb50322c5a645dd33fbfcc1c8155..f58873ef4362bfcc618ead099be94ba2dd4d86ed 100644
index a030762ea9888b5fab04c5c80acdacccb76f0e46..e3ba1f8f90b5cb8c8bf315f43dae63cd5ba0d77e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -690,7 +690,20 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -3202,10 +3202,10 @@ 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 dbefefc123e3cb38a95bd321d74c384bc087cfba..d18b82f1f66cd10250a12222dfb983ef57629738 100644
index c3a5aa2cbfeef1d2841ef85d135a2f6e0a7a2f61..9aab29dd7a09c306d6c0e1e8143daf005d611d65 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
@@ -1222,6 +1222,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleEditBook(ServerboundEditBookPacket packet) {
@ -3213,7 +3213,7 @@ index dbefefc123e3cb38a95bd321d74c384bc087cfba..d18b82f1f66cd10250a12222dfb983ef
// Paper start
if (!this.cserver.isPrimaryThread()) {
List<String> pageList = packet.getPages();
@@ -2365,6 +2366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2368,6 +2369,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
private boolean updateChatOrder(Instant timestamp) {
@ -5664,7 +5664,7 @@ index b1992ed5136cc7dcf04219868b94b3c37ae36b4b..5b5339cba819368f4d6b7eaf404fa59b
@Nullable
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 964ec590ef5302576ecb3ba2b8ea95dbc2acf103..bfd4520ef6f085685a25cf7f49907e16202e6386 100644
index b777c1294370bdc68bc6265b039e2a405d89f2f5..a464d0a771875d3574fe4e461abe7212a933baf5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

6
patches/server/0003-Rebrand.patch
View File

@ -168,7 +168,7 @@ index abe37c7c3c6f5ab73afd738ec78f06d7e4d2ed96..b5b6657e52e4f7a630229bd3ba433438
stringbuilder.append(CrashReport.getErrorComment());
stringbuilder.append("\n\n");
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 06d31a03ec7d049649e94d013429d2197b697545..f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b 100644
index e7fcef13bfbbe7745ea39f1ceaf7652459dde8b9..212ce23d04cadc695e729c09e2dec7179929ca71 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -298,7 +298,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -189,7 +189,7 @@ index 06d31a03ec7d049649e94d013429d2197b697545..f0eb6be38cb2c53f4f19d4e18a8d0323
while (this.getRunningThread().isAlive()) {
this.getRunningThread().stop();
try {
@@ -1658,7 +1658,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1674,7 +1674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@ -231,7 +231,7 @@ index c31b9a6b1d4548d507ecb60d42ca9f96f49f6c4b..f613825c69a8d683b8029fe345031259
private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index bfd4520ef6f085685a25cf7f49907e16202e6386..7424f3f2f9942170d1f0b98e61b5712901d2fd60 100644
index a464d0a771875d3574fe4e461abe7212a933baf5..27b2416f725a57fcdc14378e7c14713978e51783 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -248,7 +248,7 @@ import javax.annotation.Nullable; // Paper

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

@ -17,10 +17,10 @@ index 3615576c24d5d6790a6894a91180de25fa0e5a9c..266a26d73dd5aec427b64a638693decf
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 d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab855fa87c 100644
index 9aab29dd7a09c306d6c0e1e8143daf005d611d65..0f9dea99893581122a6d5f9176b374c1c815973c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3645,6 +3645,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3653,6 +3653,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 d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3669,6 +3670,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3677,6 +3678,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
}
@ -43,7 +43,7 @@ index d18b82f1f66cd10250a12222dfb983ef57629738..c23ffdd17ba9fdf88fdce8cfe86f58ab
try {
byte[] data = new byte[packet.data.readableBytes()];
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ef9c3a7b15a4901e1662e6d55504b9cbbb804ad3..a20e1a533e9f764fbf00e768fd8286c8f7868a78 100644
index 067d64ce06f626ce90b3ccf608d98f3c64fce335..6260f4246b24f5037e3cf718a50be3a70680132e 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2897,4 +2897,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@ -22,7 +22,7 @@ index 153451ecd5b3c8e8ecb2d5ec91ccd582d4300899..56536c39bccfe097f8227c74a0d16799
super(x, y, z);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b..1e0dd0f16081281c18e6c131a3d8b7f83b11805b 100644
index 212ce23d04cadc695e729c09e2dec7179929ca71..246ce99830ba803abe487e3c43f453e75d9c5c1f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1535,6 +1535,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -34,7 +34,7 @@ index f0eb6be38cb2c53f4f19d4e18a8d03232375fc6b..1e0dd0f16081281c18e6c131a3d8b7f8
this.profiler.push(() -> {
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index e4a341351a5f4e1f3ffed1708eb3a1fd81b94f0f..a12238ee1dc58232f04586f60fb7f662eac22a10 100644
index d5b17e284c7305b51f21f908bc2b12b3927d7790..9fe1f5aea08be6395e16de18e5abfe72a150280f 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -219,6 +219,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -66,10 +66,10 @@ index 2049fa1008be5208d9bb168dd65483613a7296f1..8e3e3dbbea328f76a790477545b46d2d
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 c23ffdd17ba9fdf88fdce8cfe86f58ab855fa87c..667c72da85b4d6b778739402f4bb1f9f24f7d705 100644
index 0f9dea99893581122a6d5f9176b374c1c815973c..f11f917130298aeca48fa51c1d9ea8150df60d8b 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2918,6 +2918,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2921,6 +2921,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);

16
patches/server/0012-AFK-API.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb46826c4369a9 100644
index 8e3e3dbbea328f76a790477545b46d2d3013546b..905aa1311791564720e541fc4fbe1e4f8d38a0e7 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -2001,8 +2001,58 @@ public class ServerPlayer extends Player {
@ -68,10 +68,10 @@ index 1628989f81e76fc61b2a894f7037f5630a1491bc..c72b20e3e7eda999c6da07e7e6fb4682
return this.stats;
}
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a17988474344d244 100644
index f11f917130298aeca48fa51c1d9ea8150df60d8b..b10a5f39145cf62b981fad6595e42ac09602d510 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -340,6 +340,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -343,6 +343,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private boolean justTeleported = false;
private boolean hasMoved; // Spigot
@ -92,7 +92,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
public CraftPlayer getCraftPlayer() {
return (this.player == null) ? null : (CraftPlayer) this.player.getBukkitEntity();
}
@@ -442,6 +456,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -445,6 +459,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (this.player.getLastActionTime() > 0L && this.server.getPlayerIdleTimeout() > 0 && Util.getMillis() - this.player.getLastActionTime() > (long) (this.server.getPlayerIdleTimeout() * 1000 * 60) && !this.player.wonGame) { // Paper - Prevent AFK kick while watching end credits.
@ -105,7 +105,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
this.player.resetLastActionTime(); // CraftBukkit - SPIGOT-854
this.disconnect(Component.translatable("multiplayer.disconnect.idling"), org.bukkit.event.player.PlayerKickEvent.Cause.IDLING); // Paper - kick event cause
}
@@ -747,6 +767,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -750,6 +770,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@ -114,7 +114,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
// Skip the first time we do this
if (true) { // Spigot - don't skip any move events
Location oldTo = to.clone();
@@ -1551,7 +1573,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1554,7 +1576,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (!this.player.isChangingDimension() && d11 > org.spigotmc.SpigotConfig.movedWronglyThreshold && !this.player.isSleeping() && !this.player.gameMode.isCreative() && this.player.gameMode.getGameModeForPlayer() != GameType.SPECTATOR) { // Spigot
flag2 = true; // Paper - diff on change, this should be moved wrongly
@ -123,7 +123,7 @@ index 33ec7ca690cf1400f6b1fcbfa44686f790f97ec3..094698b4bf0546704d5ade47a1798847
}
this.player.absMoveTo(d0, d1, d2, f, f1);
@@ -1601,6 +1623,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1604,6 +1626,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.lastYaw = to.getYaw();
this.lastPitch = to.getPitch();
@ -213,7 +213,7 @@ index 3f458ddd4dc04ed28510a212be76bb19e7f6a61e..a36469186f72eccf8c4428d920d0583b
if (range < 0.0D || d < range * range) {
return true;
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index a20e1a533e9f764fbf00e768fd8286c8f7868a78..fd5906dd18a4ff377c6e2dd180008124faa9600d 100644
index 6260f4246b24f5037e3cf718a50be3a70680132e..c57264e4f4284550d674a9c4083cc9cfbeb355bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -442,10 +442,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

4
patches/server/0014-Configurable-server-mod-name.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Configurable server mod name
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1e0dd0f16081281c18e6c131a3d8b7f83b11805b..48bf3a9938aae8d6cc847a80cf95cfda305414f5 100644
index 246ce99830ba803abe487e3c43f453e75d9c5c1f..298e63f4acdcd52158eff83c5ee60846c6628e29 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1659,7 +1659,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1675,7 +1675,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {

10
patches/server/0019-Player-invulnerabilities.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities
diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
index c72b20e3e7eda999c6da07e7e6fb46826c4369a9..481e474f48d9409f4d8a337b334a17627c9b8ccb 100644
index 905aa1311791564720e541fc4fbe1e4f8d38a0e7..577a8a033c13832bc9cf5783b8cd6d470002c2a2 100644
--- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
@@ -263,6 +263,7 @@ public class ServerPlayer extends Player {
@ -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 094698b4bf0546704d5ade47a17988474344d244..9eef5e10a4528e56080f4bc1438b483304720a4f 100644
index b10a5f39145cf62b981fad6595e42ac09602d510..9873e559675203df5fc0b44c820fdd2671b17c23 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2102,12 +2102,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2105,12 +2105,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleResourcePackResponse(ServerboundResourcePackPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());
@ -108,7 +108,7 @@ index 094698b4bf0546704d5ade47a17988474344d244..9eef5e10a4528e56080f4bc1438b4833
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 989562f870c359cf4655af2b2013b2b1b5f1f229..fc27bdf91b946ac4c2a6e4adec3693fd0ea5324a 100644
index 0751456e9431359afa41d224c5438ac6e71644a1..27db72513532ef69c49d4c805f1bf76718a37908 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1008,6 +1008,8 @@ public abstract class PlayerList {
@ -121,7 +121,7 @@ index 989562f870c359cf4655af2b2013b2b1b5f1f229..fc27bdf91b946ac4c2a6e4adec3693fd
return entityplayer1;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fd5906dd18a4ff377c6e2dd180008124faa9600d..0655abd90e7fc34518153b320f5674bd4ebe8f5d 100644
index c57264e4f4284550d674a9c4083cc9cfbeb355bb..28ee76ac0df38787274a0c2e84738ece7537f5be 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2923,5 +2923,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

8
patches/server/0022-Alternative-Keepalive-Handling.patch
View File

@ -5,10 +5,10 @@ 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 7bbcd533a577132a7ccbb5c3d759b1db361efc11..f3afa32d08be6d21d0061d563970db062ccbf1c1 100644
index 9873e559675203df5fc0b44c820fdd2671b17c23..accc5e15eef680c82bab4fdcf759d7b17e57dd67 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
@@ -261,6 +261,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
private long keepAliveTime = Util.getMillis();
private boolean keepAlivePending;
private long keepAliveChallenge;
@ -16,7 +16,7 @@ index 7bbcd533a577132a7ccbb5c3d759b1db361efc11..f3afa32d08be6d21d0061d563970db06
// CraftBukkit start - multithreaded fields
private final AtomicInteger chatSpamTickCount = new AtomicInteger();
private final java.util.concurrent.atomic.AtomicInteger tabSpamLimiter = new java.util.concurrent.atomic.AtomicInteger(); // Paper - configurable tab spam limits
@@ -424,6 +425,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -427,6 +428,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
long currentTime = Util.getMillis();
long elapsedTime = currentTime - this.keepAliveTime;
@ -38,7 +38,7 @@ index 7bbcd533a577132a7ccbb5c3d759b1db361efc11..f3afa32d08be6d21d0061d563970db06
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
@@ -3630,6 +3646,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3638,6 +3654,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

10
patches/server/0077-Allow-color-codes-in-books.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Allow color codes in books
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f981790dd98eec 100644
index accc5e15eef680c82bab4fdcf759d7b17e57dd67..9ad05f4e414e147ff1bdb90d83fa700b30d311a5 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1345,13 +1345,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1348,13 +1348,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
itemstack1.setTag(nbttagcompound.copy());
}
@ -28,7 +28,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179
this.updateBookPages(pages, (s) -> {
return Component.Serializer.toJson(Component.literal(s));
@@ -1363,10 +1366,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1366,10 +1369,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
public void updateBookPages(List<FilteredText> list, UnaryOperator<String> unaryoperator, ItemStack itemstack, int slot, ItemStack handItem) { // CraftBukkit
ListTag nbttaglist = new ListTag();
@ -44,7 +44,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179
Objects.requireNonNull(nbttaglist);
stream.forEach(nbttaglist::add);
@@ -1376,11 +1382,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1379,11 +1385,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
for (int j = list.size(); i < j; ++i) {
FilteredText filteredtext = (FilteredText) list.get(i);
@ -58,7 +58,7 @@ index b996a4903fcbaf308ff141b9c05d516832fcee47..0f90a7be083723e72dc6f24087f98179
}
}
@@ -1393,6 +1399,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1396,6 +1402,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.player.getInventory().setItem(slot, CraftEventFactory.handleEditBookEvent(player, slot, handItem, itemstack)); // CraftBukkit // Paper - Don't ignore result (see other callsite for handleEditBookEvent)
}

4
patches/server/0078-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 31218d0f09b011617300e4297ca7506f50494684..6f86c57b298067117b0c8f7d738ba20d1af98fea 100644
index 9ad05f4e414e147ff1bdb90d83fa700b30d311a5..bdabf2ce37b8662fe3d2387b791eee217ce7b61c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2973,6 +2973,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2976,6 +2976,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {

6
patches/server/0127-PlayerBookTooLargeEvent.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] PlayerBookTooLargeEvent
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 666c5b9792da335bc85a964b15296fcecbf4d43f..57ffb4b246f38d81e19e0f369a245b6beb2b6d41 100644
index bdabf2ce37b8662fe3d2387b791eee217ce7b61c..1cee1e7f228d52af4f166d122f21ad37c3704a46 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1265,10 +1265,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1268,10 +1268,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
int maxBookPageSize = io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.pageMax;
double multiplier = Math.max(0.3D, Math.min(1D, io.papermc.paper.configuration.GlobalConfiguration.get().itemValidation.bookSize.totalMultiplier));
long byteAllowed = maxBookPageSize;
@ -21,7 +21,7 @@ index 666c5b9792da335bc85a964b15296fcecbf4d43f..57ffb4b246f38d81e19e0f369a245b6b
server.scheduleOnMain(() -> this.disconnect("Book too large!", org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_ACTION)); // Paper - kick event cause
return;
}
@@ -1292,6 +1294,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1295,6 +1297,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (byteTotal > byteAllowed) {
ServerGamePacketListenerImpl.LOGGER.warn(this.player.getScoreboardName() + " tried to send too large of a book. Book Size: " + byteTotal + " - Allowed: "+ byteAllowed + " - Pages: " + pageList.size());

6
patches/server/0140-Dont-run-with-scissors.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Dont run with scissors!
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 57ffb4b246f38d81e19e0f369a245b6beb2b6d41..72422e08da8bb07181b777b073d12b0c87e2b8ea 100644
index 1cee1e7f228d52af4f166d122f21ad37c3704a46..c914fbbb8b63506e345c747ff5ef0bbbb471c9eb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -1699,6 +1699,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1702,6 +1702,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.player.resetFallDistance();
}
@ -22,7 +22,7 @@ index 57ffb4b246f38d81e19e0f369a245b6beb2b6d41..72422e08da8bb07181b777b073d12b0c
this.player.checkMovementStatistics(this.player.getX() - d3, this.player.getY() - d4, this.player.getZ() - d5);
this.lastGoodX = this.player.getX();
this.lastGoodY = this.player.getY();
@@ -1732,6 +1739,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1735,6 +1742,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Paper end - optimise out extra getCubes

6
patches/server/0210-Add-compass-command.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Add compass command
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index dc76507dd19e263cc3a0d566c0ea237ad1203a63..e04c2f0cdba79526ca03faa03409a3cb4767aad4 100644
index 6a044a9c97db9bba75f8dbbaa8515e3167841855..edd378813873ed367784379b0f1666d1ccf2194d 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -212,6 +212,7 @@ public class Commands {
@ -174,7 +174,7 @@ index d38b3c4a722396cc3b61a9a8ed7e39cea4ae65cb..d333334f323049ca97e756324cff0b23
}
diff --git a/src/main/java/org/purpurmc/purpur/task/CompassTask.java b/src/main/java/org/purpurmc/purpur/task/CompassTask.java
new file mode 100644
index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4fee2eca9
index 0000000000000000000000000000000000000000..5c06909e343f06b00816fcf227c7080aec8057ce
--- /dev/null
+++ b/src/main/java/org/purpurmc/purpur/task/CompassTask.java
@@ -0,0 +1,68 @@
@ -206,7 +206,7 @@ index 0000000000000000000000000000000000000000..bdb214bc2e0d944a26c825c1124d23d4
+ }
+ tick = 0;
+
+ MinecraftServer.getServer().levels.forEach((key, level) -> {
+ MinecraftServer.getServer().getAllLevels().forEach((level) -> {
+ if (level.purpurConfig.compassItemShowsBossBar) {
+ level.players.forEach(player -> {
+ if (!player.compassBar()) {

4
patches/server/0227-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 72422e08da8bb07181b777b073d12b0c87e2b8ea..aa18ee0cb53f527c0043cdbf39d3848c6f660b8b 100644
index c914fbbb8b63506e345c747ff5ef0bbbb471c9eb..7f3c1c9776aab0b92cac6feb1845e55a701a5705 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2098,6 +2098,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2101,6 +2101,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
boolean cancelled;
if (movingobjectposition == null || movingobjectposition.getType() != HitResult.Type.BLOCK) {

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

@ -17,10 +17,10 @@ index 68008facb6cfcccbcb7501c84c5da9014321ce4a..4d28a1f9fe43bb8e9f5ffaf06895c94f
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 a9a994cb3c881f9c2ffe2f80d5179f7f8863acb8..5390b04e4e20b00e53875325c59f2182ed7163b2 100644
index 7f3c1c9776aab0b92cac6feb1845e55a701a5705..1eafc5667fd6a9746df7f4233cb021c2c435347e 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3654,11 +3654,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3662,11 +3662,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
for (int i = 0; i < signText.size(); ++i) {
FilteredText filteredtext = (FilteredText) signText.get(i);

4
patches/server/0275-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 5390b04e4e20b00e53875325c59f2182ed7163b2..1e5645a23f2ded431dac29cce0d437662c2f1464 100644
index 1eafc5667fd6a9746df7f4233cb021c2c435347e..25c9f742ad12a3ccab9860b4fc1de3d77ea9de82 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2689,7 +2689,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2692,7 +2692,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}

4
patches/server/0279-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 1e5645a23f2ded431dac29cce0d437662c2f1464..2defad9eec0c7eae12b0688e08959c17f821228d 100644
index 25c9f742ad12a3ccab9860b4fc1de3d77ea9de82..cf24035eb1d145c2118d3ee57527f7cf9d2246fc 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2454,7 +2454,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2457,7 +2457,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
do {
instant1 = (Instant) this.lastChatTimeStamp.get();
if (timestamp.isBefore(instant1)) {

4
patches/server/0286-Allow-custom-ChatDecorators.patch
View File

@ -6,10 +6,10 @@ Subject: [PATCH] Allow custom ChatDecorators
Requires NMS to utilize. I'll write an API for this once our upstreams calm down with the changes.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 89c672b03e7bc932e2afb46e708a49a8fe66ff76..100460d26fbb645a138f1883335ce7838b243a19 100644
index be18103099ba47711bcd36c6f9379fb3d05aaa4e..508a3fa75a900fb5dc7729aebd3b9c7116aac66c 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -2629,6 +2629,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2645,6 +2645,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper
public ChatDecorator getChatDecorator() {

4
patches/server/0287-Cache-server-motd.patch
View File

@ -6,7 +6,7 @@ Subject: [PATCH] Cache server motd
Paper ported my patch in an odd way. Keeping my patch around to reduce logic on the motd getter
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 100460d26fbb645a138f1883335ce7838b243a19..1c77d96f51e32fff7907f372f2303266cb6d0c77 100644
index 508a3fa75a900fb5dc7729aebd3b9c7116aac66c..7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -234,7 +234,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -18,7 +18,7 @@ index 100460d26fbb645a138f1883335ce7838b243a19..1c77d96f51e32fff7907f372f2303266
private int playerIdleTimeout;
public final long[] tickTimes;
// Paper start
@@ -1886,17 +1886,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1902,17 +1902,12 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public net.kyori.adventure.text.Component getComponentMotd() {

18
patches/server/0288-Remove-Timings.patch
View File

@ -103,7 +103,7 @@ index 8bc0cb9ad5bb4e76d962ff54305e2c08e279a17b..e8efbbeece7e866c6c4d7489677d2d9e
PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet);
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1c77d96f51e32fff7907f372f2303266cb6d0c77..04e9d7aff458e59a43df6830ff82ac9d5708ee47 100644
index 7febaa45e5d4e3bbf4a506f2049dd2fd45573b0e..3ac653f12287fd8ad8966017d3faab2541cfd3b6 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1427,15 +1427,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -232,7 +232,7 @@ index 1c77d96f51e32fff7907f372f2303266cb6d0c77..04e9d7aff458e59a43df6830ff82ac9d
this.profiler.pop();
}
@@ -2767,7 +2767,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2783,7 +2783,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
return;
}
@ -241,7 +241,7 @@ index 1c77d96f51e32fff7907f372f2303266cb6d0c77..04e9d7aff458e59a43df6830ff82ac9d
try {
for (;;) {
boolean moreTasks = this.tickMidTickTasks();
@@ -2794,7 +2794,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2810,7 +2810,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
}
} finally {
@ -591,7 +591,7 @@ index 378cc1f9e19eb9b18037ab8af92f65897e15a405..de4b8001ff0ddb1603fcca2b6829bb55
// Paper end - use set of chunks requiring updates, rather than iterating every single one loaded
// Paper start - controlled flush for entity tracker packets
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index c685e0acb2559e7415c94790d8392f0ee997ecc6..ad14dbed67ca622f9c8e05164104fe9a9c5b59d4 100644
index 014862d564726b64989df37957ba2b6b7ae81973..625a3af718ab3b256c43547bd91621f8c70b3bbd 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -649,7 +649,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -769,10 +769,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 2defad9eec0c7eae12b0688e08959c17f821228d..2c9a7a8e21aa8d03569840a3d157d0d2e0e00e72 100644
index cf24035eb1d145c2118d3ee57527f7cf9d2246fc..9dbd5c2e7d0c9bb26556ce32ced4c43ad9f3df0c 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2604,7 +2604,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2607,7 +2607,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
}
// Paper End
@ -781,7 +781,7 @@ index 2defad9eec0c7eae12b0688e08959c17f821228d..2c9a7a8e21aa8d03569840a3d157d0d2
if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
this.LOGGER.info(this.player.getScoreboardName() + " issued server command: " + s);
@@ -2614,7 +2614,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2617,7 +2617,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.cserver.getPluginManager().callEvent(event);
if (event.isCancelled()) {
@ -790,7 +790,7 @@ index 2defad9eec0c7eae12b0688e08959c17f821228d..2c9a7a8e21aa8d03569840a3d157d0d2
return;
}
@@ -2627,7 +2627,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2630,7 +2630,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 {
@ -1036,7 +1036,7 @@ index 3f45bab0e9f7b3697e6d9d1092a1e6e579f7066f..4f1cf281c4bf68c37982d390da8779de
long getCreatedAt() {
diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
index c74ac9cf5db4d8adfe781cf066258011da469717..73c48bbb3c6ff9de15acb7adaa15f904785ccfef 100644
index 138407c2d4b0bc55ddb9aac5d2aa3edadda090fb..a6e9e503a496c18e2501b03ec84f4600c134a50c 100644
--- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
+++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
@@ -115,7 +115,7 @@ public final class CraftScoreboardManager implements ScoreboardManager {

20
patches/server/0289-Remove-Mojang-Profiler.patch
View File

@ -5,7 +5,7 @@ Subject: [PATCH] Remove Mojang Profiler
diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
index e04c2f0cdba79526ca03faa03409a3cb4767aad4..4bf5efd39938db79bba660efc2969022e8057abd 100644
index edd378813873ed367784379b0f1666d1ccf2194d..eb4dac2239592d680ef31edf47f1ab660299762d 100644
--- a/src/main/java/net/minecraft/commands/Commands.java
+++ b/src/main/java/net/minecraft/commands/Commands.java
@@ -137,7 +137,7 @@ public class Commands {
@ -39,7 +39,7 @@ index e04c2f0cdba79526ca03faa03409a3cb4767aad4..4bf5efd39938db79bba660efc2969022
return b0;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6b4884207 100644
index 3ac653f12287fd8ad8966017d3faab2541cfd3b6..3d30dbb66d05f76545e119243cba4d549cbae714 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -328,13 +328,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@ -232,7 +232,7 @@ index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6
}
public boolean isNetherEnabled() {
@@ -2258,7 +2258,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2274,7 +2274,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public ProfilerFiller getProfiler() {
@ -241,7 +241,7 @@ index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6
return this.profiler;
}
@@ -2498,7 +2498,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2514,7 +2514,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
private void startMetricsRecordingTick() {
@ -250,7 +250,7 @@ index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6
this.metricsRecorder = ActiveMetricsRecorder.createStarted(new ServerMetricsSamplersProvider(Util.timeSource, this.isDedicatedServer()), Util.timeSource, Util.ioPool(), new MetricsPersister("server"), this.onMetricsRecordingStopped, (path) -> {
this.executeBlocking(() -> {
this.saveDebugReport(path.resolve("server"));
@@ -2508,40 +2508,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2524,40 +2524,40 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
this.willStartRecordingMetrics = false;
}
@ -303,7 +303,7 @@ index 04e9d7aff458e59a43df6830ff82ac9d5708ee47..626f97882f2335ccf22d25c40aa389e6
}
public Path getWorldPath(LevelResource worldSavePath) {
@@ -2586,15 +2586,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -2602,15 +2602,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
public boolean isTimeProfilerRunning() {
@ -586,7 +586,7 @@ index de4b8001ff0ddb1603fcca2b6829bb55289d651e..1c49aec79581c6bbeaeb87e42f98ed22
}
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index ad14dbed67ca622f9c8e05164104fe9a9c5b59d4..c50dc34a731477c76315d8ef6b59b8539b76c7e3 100644
index 625a3af718ab3b256c43547bd91621f8c70b3bbd..d1bc23c939e12f040843c1105df87b802137d198 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -616,12 +616,12 @@ public class ServerLevel extends Level implements WorldGenLevel {
@ -835,10 +835,10 @@ index 4d28a1f9fe43bb8e9f5ffaf06895c94fa0749d5d..08c46cdc626e89fed0d769d50735e983
this.connection.send(new ClientboundPlayerAbilitiesPacket(this.getAbilities()));
playerlist.sendLevelInfo(this, worldserver);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 2c9a7a8e21aa8d03569840a3d157d0d2e0e00e72..eac0202c2622fc99712df23f1591c9cc3d8b0cbc 100644
index 9dbd5c2e7d0c9bb26556ce32ced4c43ad9f3df0c..93c0560df791e768277e33999379738ec597a6dd 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -419,7 +419,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -422,7 +422,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
this.aboveGroundVehicleTickCount = 0;
}} // Paper - end if (valid)
@ -847,7 +847,7 @@ index 2c9a7a8e21aa8d03569840a3d157d0d2e0e00e72..eac0202c2622fc99712df23f1591c9cc
// Paper Start - give clients a longer time to respond to pings as per pre 1.12.2 timings
// This should effectively place the keepalive handling back to "as it was" before 1.12.2
long currentTime = Util.getMillis();
@@ -455,7 +455,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -458,7 +458,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
// Paper end

6
patches/server/0290-Add-more-logger-output-for-invalid-movement-kicks.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] Add more logger output for invalid movement kicks
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index 702a3de778093c6a8c58c2602753a6a0ee1dfb31..e766dbabf6e0868d79f33aef3ee3ac466e40c2a1 100644
index 93c0560df791e768277e33999379738ec597a6dd..9adc717cffee5065863e2972ad749517e5a4a2a3 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -861,6 +861,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -864,6 +864,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
if (packet.getId() == this.awaitingTeleport) {
if (this.awaitingPositionFromClient == null) {
this.disconnect(Component.translatable("multiplayer.disconnect.invalid_player_movement"), org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PLAYER_MOVEMENT); // Paper - kick event cause
@ -16,7 +16,7 @@ index 702a3de778093c6a8c58c2602753a6a0ee1dfb31..e766dbabf6e0868d79f33aef3ee3ac46
return;
}
@@ -1441,8 +1442,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -1444,8 +1445,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleMovePlayer(ServerboundMovePlayerPacket packet) {
PacketUtils.ensureRunningOnSameThread(packet, this, this.player.getLevel());