Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@7569191 Send disguised chat for vanished players
PaperMC/Paper@96fd31b Fix chunk sending when the computed time overflows (#8833)
PaperMC/Paper@39aef52 Fix `Tick::addTo`/`::between` causing SOE (#8824)
PaperMC/Paper@0c3311c Add Entity Body Yaw API (#8822)
PaperMC/Paper@0c9ace8 Add AntiXray layered obfuscation mode (#8799)
PaperMC/Paper@5eca964 [ci skip] Rebuild patches
This commit is contained in:
granny
2023-02-09 17:55:16 -08:00
parent bac7738314
commit 0090323edb
17 changed files with 43 additions and 43 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.3-R0.1-SNAPSHOT
paperCommit = 57f11578714a6a52111130dbabb702b30cdc746f
paperCommit = 5eca9642e1680e3e1074653d1c9e43799d172332
org.gradle.caching = true
org.gradle.parallel = true

6
patches/api/0013-LivingEntity-safeFallDistance.patch
View File

@@ -5,12 +5,12 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 6555397148b84dba7a87cae505544b65452f1742..3aee8f29fece72485eb9ada371d6444633120a53 100644
index 1da1c293ac8a13d22743c26d35624155bfa73a16..df181fc97e56fcde382235cb1262d65b9bb9ff85 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1126,4 +1126,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1142,4 +1142,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void damageItemStack(org.bukkit.inventory.@NotNull EquipmentSlot slot, int amount);
void setBodyYaw(float bodyYaw);
// Paper end
+
+ // Purpur start

4
patches/api/0022-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 3aee8f29fece72485eb9ada371d6444633120a53..7f828209e0323475ec51e44975e3b3ac10aa265b 100644
index df181fc97e56fcde382235cb1262d65b9bb9ff85..5957c30607fdb202c5400b6b2513692126fa76b5 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1141,5 +1141,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1157,5 +1157,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

4
patches/api/0034-API-for-any-mob-to-burn-daylight.patch
View File

@@ -23,10 +23,10 @@ index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 7f828209e0323475ec51e44975e3b3ac10aa265b..ebc42a0ed4b24564a5055fef50468142529aed2f 100644
index 5957c30607fdb202c5400b6b2513692126fa76b5..127bf9621cca12327ac06becdd921a5f843b888d 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1148,5 +1148,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1164,5 +1164,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param slot Equipment slot to play break animation for
*/
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);

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

@@ -17,10 +17,10 @@ index 7d6d3c8556033d289fdadc489e73fba478fce41a..c2ff5d7e4a9f7477b7b207e9d3fb7241
public ServerPlayer(MinecraftServer server, ServerLevel world, GameProfile profile) {
super(world, world.getSharedSpawnPos(), world.getSharedSpawnAngle(), profile);
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
index a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a353508c10 100644
index d04a30ee940a785b848240ae6b1aa9705deb7902..9c5f191205b5f413890e78e316a08e6f5542bdc1 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3505,6 +3505,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3511,6 +3511,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 a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a3
@Override
public void handleCustomPayload(ServerboundCustomPayloadPacket packet) {
@@ -3529,6 +3530,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3535,6 +3536,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,10 +43,10 @@ index a50af1f62661622f4a162c7dbad4e7ff056a64ef..6ca749d957ff04f9c6e48271da0046a3
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 616d0c3b72c7a5fcc67981c1919a4dece904d017..550fef6ccf5319dfe4206bfe1dd01fcd56ac659d 100644
index 603cc41df6bcf726d996427e47876299d05d44db..09a806702d39fe4d7e7c5668afbd4168382d0854 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3042,4 +3042,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3048,4 +3048,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.spigot;
}
// Spigot end

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

@@ -66,7 +66,7 @@ index f3024b03ff7709893d6e39f54504597bb59f5315..f6360f2973c03e0105361f9e001360ec
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 6ca749d957ff04f9c6e48271da0046a353508c10..132c3e1ab9e65c778d3f1a7527a9f9c49337d8b4 100644
index 9c5f191205b5f413890e78e316a08e6f5542bdc1..422c06e58f8dce24127a2178d3d23cdd034a2369 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -716,7 +716,6 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -77,7 +77,7 @@ index 6ca749d957ff04f9c6e48271da0046a353508c10..132c3e1ab9e65c778d3f1a7527a9f9c4
// If the packet contains look information then we update the To location with the correct Yaw & Pitch.
to.setYaw(packet.getYRot());
to.setPitch(packet.getXRot());
@@ -2772,6 +2771,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2778,6 +2777,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event);
@@ -5115,7 +5115,7 @@ index e92e6fb4cf97f4d5406b5b5d5786bfa5fb55f536..64fb6f2ea7b792d131feca7278034336
this.setTradingPlayer(player);
this.openTradingScreen(player, this.getDisplayName(), 1);
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index 61597ebe2f9faff43994c475074b87d11905e582..e0f3375653db94d5fd2e154b72cae3d2113aaab1 100644
index f6e4194856d4a2710a169b5823e74da1ba2c9130..bc9198a76f6b5aa5d526882e214d731d5b06f52b 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -194,6 +194,19 @@ public abstract class Player extends LivingEntity {

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

@@ -73,7 +73,7 @@ index f6360f2973c03e0105361f9e001360ec01488ce6..e40144aad9182ccb2ed871d74378cf0a
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 132c3e1ab9e65c778d3f1a7527a9f9c49337d8b4..668572e6819acdca4b658f693bf9069961dd3366 100644
index 422c06e58f8dce24127a2178d3d23cdd034a2369..96dbffd6e892734a120bcb3b19bd15bdf027df8f 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -335,6 +335,20 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -218,7 +218,7 @@ index 3b959f42d958bf0f426853aee56753d6c455fcdb..d17abb283ea818244df0379d6b57fc63
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 550fef6ccf5319dfe4206bfe1dd01fcd56ac659d..7a0e39158223ce3c8df8ae8faf8ea86aab7a4d54 100644
index 09a806702d39fe4d7e7c5668afbd4168382d0854..707751397ee385348411c393181115da5a7d9d28 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -524,10 +524,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -238,7 +238,7 @@ index 550fef6ccf5319dfe4206bfe1dd01fcd56ac659d..7a0e39158223ce3c8df8ae8faf8ea86a
for (ServerPlayer player : (List<ServerPlayer>) server.getHandle().players) {
if (player.getBukkitEntity().canSee(this)) {
player.connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.UPDATE_DISPLAY_NAME, this.getHandle()));
@@ -3048,5 +3053,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3054,5 +3059,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public boolean usesPurpurClient() {
return getHandle().purpurClient;
}

4
patches/server/0015-LivingEntity-safeFallDistance.patch
View File

@@ -62,10 +62,10 @@ index 8b1942b396606f0c989645a6ac587fbdd26a3dc5..c1c5e884f00398032196ee71b55b348f
// Purpur start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 4439b42c97bef076efa8ec99da382414d3c522dc..97775b773a70431071bf3599d6556ab82f1f3a1f 100644
index db5952e97c5ff5c258760b70592f9ad470ce401c..29cebba7ff81bb7769eb6743d931ad27f54b6202 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1060,4 +1060,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1070,4 +1070,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
getHandle().knockback(strength, directionX, directionZ);
};
// Paper end

6
patches/server/0018-Player-invulnerabilities.patch
View File

@@ -82,7 +82,7 @@ index e40144aad9182ccb2ed871d74378cf0af783c9f1..8e6c0ab117f7c79e51470a1364995217
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 668572e6819acdca4b658f693bf9069961dd3366..367a3d1181f29375aed48a861dcf4c2172aa16f9 100644
index 96dbffd6e892734a120bcb3b19bd15bdf027df8f..6b9f618c23c329235d8d62347aa3711e9c0b39cf 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2091,12 +2091,21 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -121,10 +121,10 @@ index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202
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 7a0e39158223ce3c8df8ae8faf8ea86aab7a4d54..f157474b26ffea3c9ec5aa3f5c8a5f3c786a6bb5 100644
index 707751397ee385348411c393181115da5a7d9d28..6952f036976981c0007e917b6668ecbafc44618c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3068,5 +3068,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3074,5 +3074,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void resetIdleTimer() {
getHandle().resetLastActionTime();
}

4
patches/server/0020-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 367a3d1181f29375aed48a861dcf4c2172aa16f9..c837f6b6081885c4938d386ce7ae854bbfd2f957 100644
index 6b9f618c23c329235d8d62347aa3711e9c0b39cf..f29e934a480ad4d8fd1b7fb2224e5f5981f765c9 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -259,6 +259,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -38,7 +38,7 @@ index 367a3d1181f29375aed48a861dcf4c2172aa16f9..c837f6b6081885c4938d386ce7ae854b
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
@@ -3489,6 +3505,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3495,6 +3511,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@Override
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {

8
patches/server/0075-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 fe78d4c170c33c01caa74f9a91128ccdd1499ccb..c02327471f7bd8af3da97974871d976b2eea595f 100644
index 952b1bf1a1b4da6c6b691099d20c9a3fbe7f0a2e..2018a1b24f3cb50aafc0593506d27e6bde248993 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -2823,6 +2823,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -2829,6 +2829,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
}
if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) {
@@ -17,7 +17,7 @@ index fe78d4c170c33c01caa74f9a91128ccdd1499ccb..c02327471f7bd8af3da97974871d976b
private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit
ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand);
diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
index bc52c86a5d10148442f41286c21301bebf7b1a43..66981c41d9880772ddca61add753270dc6133249 100644
index 4d093e8f158b40c3ff99328aa107459910e85a8d..e69aef21170be18f1582ff5e9f7e62bb1e788078 100644
--- a/src/main/java/net/minecraft/world/entity/Mob.java
+++ b/src/main/java/net/minecraft/world/entity/Mob.java
@@ -134,6 +134,7 @@ public abstract class Mob extends LivingEntity {
@@ -95,7 +95,7 @@ index bc52c86a5d10148442f41286c21301bebf7b1a43..66981c41d9880772ddca61add753270d
}
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index aa04010dc4780f0f19937314f521208a164c2ae3..fb943790a7a6cf4174ca697cfa6c54b846086b39 100644
index 6c30a046a7f3c8f8222f0e75b9d9aa18f5ddb9f3..4ed217b503320b1272e79b0fa7c964e6038e4cdf 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -128,6 +128,11 @@ public class PurpurWorldConfig {

4
patches/server/0091-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 97775b773a70431071bf3599d6556ab82f1f3a1f..ce9e00d45a7b090fae5201a768fe587fb6d959de 100644
index 29cebba7ff81bb7769eb6743d931ad27f54b6202..ba71b61705ea568d1493b8be338010ce7bf9d8d4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1071,5 +1071,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1081,5 +1081,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance;
}

4
patches/server/0179-API-for-any-mob-to-burn-daylight.patch
View File

@@ -367,10 +367,10 @@ index 39ae7bdac23601c567013799375bf32b96d4e1fd..62ef6f620608f9b1147f525f5cc1540f
/*
* Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index ce9e00d45a7b090fae5201a768fe587fb6d959de..e21a20d1c4c5c40ed96fc3226dd3accceb19ebe6 100644
index ba71b61705ea568d1493b8be338010ce7bf9d8d4..c976bbd5852ff6916a45651125f9a44cbbbdf4fb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -1077,5 +1077,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -1087,5 +1087,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
}

4
patches/server/0216-Extended-OfflinePlayer-API.patch
View File

@@ -223,10 +223,10 @@ index 714afc98b5150907b45a00060be4e41582333204..312a6d90c0a09570aef24c205dc2ff27
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index e9dd10fcf1db1204f905ebeecfa0fccb83717205..ff3ff7fb1aaacba3e2551666dcd1b385a526bdce 100644
index d18ad566ba82c5b02614050eb8c679836eda73b6..8d7c37784cdec81a9dab4d605dd2fee0e9b357bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -2258,6 +2258,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -2264,6 +2264,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
return this.getHandle().getAbilities().walkingSpeed * 2f;
}

6
patches/server/0231-Signs-allow-color-codes.patch
View File

@@ -17,10 +17,10 @@ index 3f642a1a6d74d80d78e06441b50769810b820364..421493a14ac3908d4ae4032e4f199225
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 c35295ff180e797d7933788964a849719bfd25f1..27abf5ded45a803ebb75601a3e8a974875dd58a7 100644
index debc05de0ad4a732b4d0ac4ccdc01014551550de..41aa546969e4c8248229a9fb47046dd5380da0bb 100644
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
@@ -3513,11 +3513,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
@@ -3519,11 +3519,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
for (int i = 0; i < signText.size(); ++i) {
FilteredText filteredtext = (FilteredText) signText.get(i);
@@ -70,7 +70,7 @@ index 4da4edae517a0efec6e03a719ec47b700509dab1..9e760a8e8244b15daaf0abdfc5f8a51d
public CompoundTag getUpdateTag() {
return this.saveWithoutMetadata();
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index f7ba61dea5f0f1ab82a3f193cebcaa7f162c2435..c68ec3b20ed829ed4d63ce7bdd1f266bf9d00d71 100644
index a1f0dc14f0fcba7ba2c482368642e5e02aab6664..c34f5b971128ecf0f8e7bb3e74b8714678d27cf7 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -956,8 +956,10 @@ public class PurpurWorldConfig {

4
patches/server/0282-Debug-Marker-API.patch
View File

@@ -99,10 +99,10 @@ index ba570a518f2bcdb23fd2118663c2b82e7484629d..9b5323edd99848b73ea0e34230e7bec8
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ff3ff7fb1aaacba3e2551666dcd1b385a526bdce..fbdebd237d31e3dda3923c1a1e132bb149056b66 100644
index 8d7c37784cdec81a9dab4d605dd2fee0e9b357bb..d31255de3f0ea8839cadde3d9bfd80f37a6b1bc4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3109,5 +3109,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3115,5 +3115,48 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void setSpawnInvulnerableTicks(int spawnInvulnerableTime) {
getHandle().spawnInvulnerableTime = spawnInvulnerableTime;
}

4
patches/server/0287-Add-death-screen-API.patch
View File

@@ -30,10 +30,10 @@ index 53b75f5737a910ffc5448cd9a85eae57f9c1488f..ea95873dd034779e56a8b924cd27f937
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index fbdebd237d31e3dda3923c1a1e132bb149056b66..d6c62a30d5e046ece4c13cb820037840100b78ef 100644
index d31255de3f0ea8839cadde3d9bfd80f37a6b1bc4..4390514f6c6ee214efdd014c261f480700c1f8b8 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -3152,5 +3152,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -3158,5 +3158,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
if (this.getHandle().connection == null) return;
this.getHandle().connection.send(new net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket(ClientboundCustomPayloadPacket.DEBUG_GAME_TEST_CLEAR, new FriendlyByteBuf(io.netty.buffer.Unpooled.buffer())));
}