From 8849c2022dcd5c7b5c4d7ee3597d8920d43dc719 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Wed, 23 Dec 2020 22:36:00 -0600 Subject: [PATCH] Fix afk broadcast stripped colors --- patches/server/0009-AFK-API.patch | 4 ++-- patches/server/0018-Player-invulnerabilities.patch | 2 +- patches/server/0048-Signs-allow-color-codes.patch | 2 +- patches/server/0050-Controllable-Minecarts.patch | 2 +- patches/server/0052-Players-should-not-cram-to-death.patch | 2 +- ...Add-option-to-teleport-to-spawn-if-outside-world-bor.patch | 2 +- patches/server/0098-Fix-death-message-colors.patch | 2 +- patches/server/0110-Ridables.patch | 2 +- patches/server/0130-Add-tablist-suffix-option-for-afk.patch | 2 +- patches/server/0146-Add-boat-fall-damage-config.patch | 2 +- patches/server/0149-PaperPR-Apply-advancements-async.patch | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 24dbfacc2..ecbadabd9 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -25,7 +25,7 @@ index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c548410 super(EntityTypes.PLAYER, world); this.bL = ItemStack.b; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 2c276971d47e48b39afa176994eba5747a3a3951..08a3875d7a6b8a003ba133a835dcdd75849383ae 100644 +index 2c276971d47e48b39afa176994eba5747a3a3951..33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1893,8 +1893,54 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -59,7 +59,7 @@ index 2c276971d47e48b39afa176994eba5747a3a3951..08a3875d7a6b8a003ba133a835dcdd75 + + msg = event.getBroadcastMsg(); + if (msg != null && !msg.isEmpty()) { -+ server.getPlayerList().sendAll(new PacketPlayOutChat(new ChatMessage(msg, getScoreboardDisplayName()), ChatMessageType.SYSTEM, SystemUtils.getNullUUID())); ++ server.getPlayerList().sendMessage(org.bukkit.craftbukkit.util.CraftChatMessage.fromStringOrNull(String.format(msg, getProfile().getName()))); + } + + if (world.purpurConfig.idleTimeoutUpdateTabList) { diff --git a/patches/server/0018-Player-invulnerabilities.patch b/patches/server/0018-Player-invulnerabilities.patch index a4a0ff2b7..0518ab1d0 100644 --- a/patches/server/0018-Player-invulnerabilities.patch +++ b/patches/server/0018-Player-invulnerabilities.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Player invulnerabilities diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 08a3875d7a6b8a003ba133a835dcdd75849383ae..5c4d9b1f4e926909439b9c290d7cc5726cb8822e 100644 +index 33e3ea121c2bbcea2eb9324c9a8fc384e98a8b9b..0bcbad5612b21fab158bfe5aa124d7a2916cd7d2 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -150,6 +150,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0048-Signs-allow-color-codes.patch b/patches/server/0048-Signs-allow-color-codes.patch index 3decc46ec..05c745b57 100644 --- a/patches/server/0048-Signs-allow-color-codes.patch +++ b/patches/server/0048-Signs-allow-color-codes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Signs allow color codes diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 5c4d9b1f4e926909439b9c290d7cc5726cb8822e..32d1ca467fd80de220c5bdefd23c1f84d3c80917 100644 +index 0bcbad5612b21fab158bfe5aa124d7a2916cd7d2..6323b3661a04de3206d0ac762599a3f5709a00ff 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1418,6 +1418,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0050-Controllable-Minecarts.patch b/patches/server/0050-Controllable-Minecarts.patch index 4da47092c..54ed011a2 100644 --- a/patches/server/0050-Controllable-Minecarts.patch +++ b/patches/server/0050-Controllable-Minecarts.patch @@ -106,7 +106,7 @@ index efe5c0cecaf12ef921f6d32ff6670eff051bf323..a814cf280d1ce0d446d24da8e596f13e this.move(EnumMoveType.SELF, this.getMot()); if (!this.onGround) { diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 32d1ca467fd80de220c5bdefd23c1f84d3c80917..73bf1c5fa7aa700786c49905401b0e5d59c90d39 100644 +index 6323b3661a04de3206d0ac762599a3f5709a00ff..0ad636b88dfcd955621c1db56f73333300afcb88 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -993,6 +993,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0052-Players-should-not-cram-to-death.patch b/patches/server/0052-Players-should-not-cram-to-death.patch index 265340e7f..c1571120b 100644 --- a/patches/server/0052-Players-should-not-cram-to-death.patch +++ b/patches/server/0052-Players-should-not-cram-to-death.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Players should not cram to death diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 73bf1c5fa7aa700786c49905401b0e5d59c90d39..4caca2cb5ce981aa555ceb7464fedc9e32779d88 100644 +index 0ad636b88dfcd955621c1db56f73333300afcb88..65b95816f885129b83675161478ab19b4a7de8bc 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1395,7 +1395,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 0ad3d3feb..3a513798e 100644 --- a/patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0090-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -17,7 +17,7 @@ index 93512ebabf8ab4626dea50d7a3e80fa3333a1e91..ef1c5fc24c2ffd2939e9fc10eb15ef96 } } diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 4caca2cb5ce981aa555ceb7464fedc9e32779d88..0d4ab4e8eda4059fbafe7645c9627ab5566edd85 100644 +index 65b95816f885129b83675161478ab19b4a7de8bc..1a8f894fc077d77911c8e70675b647b7c28e20b7 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -2378,4 +2378,26 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0098-Fix-death-message-colors.patch b/patches/server/0098-Fix-death-message-colors.patch index 21575154b..decf723ec 100644 --- a/patches/server/0098-Fix-death-message-colors.patch +++ b/patches/server/0098-Fix-death-message-colors.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix death message colors diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 0d4ab4e8eda4059fbafe7645c9627ab5566edd85..933d90e7026adc44e95a7c4083d6f9174ffb1f6c 100644 +index 1a8f894fc077d77911c8e70675b647b7c28e20b7..7a0d93538fbfcc559acc0ac5897aa05b4d39839f 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -841,7 +841,24 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0110-Ridables.patch b/patches/server/0110-Ridables.patch index cb93639b3..772624ac7 100644 --- a/patches/server/0110-Ridables.patch +++ b/patches/server/0110-Ridables.patch @@ -3211,7 +3211,7 @@ index a3a428da99574c485fcf2b8c7944e0d8354146ee..cf7de0127166f6175a6246062c8664e6 this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true)); this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, false)); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 933d90e7026adc44e95a7c4083d6f9174ffb1f6c..a1abdd06478da22bd9c7ea4555afb36efde826c7 100644 +index 7a0d93538fbfcc559acc0ac5897aa05b4d39839f..013f281a686adef9a678ace4051c5e51ab677378 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -508,6 +508,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0130-Add-tablist-suffix-option-for-afk.patch b/patches/server/0130-Add-tablist-suffix-option-for-afk.patch index f845f9ee0..1d37672a0 100644 --- a/patches/server/0130-Add-tablist-suffix-option-for-afk.patch +++ b/patches/server/0130-Add-tablist-suffix-option-for-afk.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add tablist suffix option for afk diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index a1abdd06478da22bd9c7ea4555afb36efde826c7..e98b5a1caf14f8480d1dd558e7dbe15f79d983de 100644 +index 013f281a686adef9a678ace4051c5e51ab677378..988e8545d4f9bf0fb0b8b8b482a29775b8a5c9f1 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1961,7 +1961,11 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0146-Add-boat-fall-damage-config.patch b/patches/server/0146-Add-boat-fall-damage-config.patch index 86957e442..90b8e6117 100644 --- a/patches/server/0146-Add-boat-fall-damage-config.patch +++ b/patches/server/0146-Add-boat-fall-damage-config.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add boat fall damage config diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index e98b5a1caf14f8480d1dd558e7dbe15f79d983de..6158263ee62f6cef0f441ccf369580ed4ac0865d 100644 +index 988e8545d4f9bf0fb0b8b8b482a29775b8a5c9f1..59f24ab35da5e3eb4d71dc9b3445abd6a2536266 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -1019,7 +1019,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting { diff --git a/patches/server/0149-PaperPR-Apply-advancements-async.patch b/patches/server/0149-PaperPR-Apply-advancements-async.patch index 4943ca41d..643f68aa1 100644 --- a/patches/server/0149-PaperPR-Apply-advancements-async.patch +++ b/patches/server/0149-PaperPR-Apply-advancements-async.patch @@ -51,7 +51,7 @@ index 98c3884f478aed1eba82c15f258ebfa1c7203b14..244b58a7c41d2b0ba3117550282e68a1 } catch (ParseException parseexception) { throw new JsonSyntaxException("Invalid datetime: " + s, parseexception); diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 6158263ee62f6cef0f441ccf369580ed4ac0865d..cee95fa977aa7df57a411b79be688e6b949b05d5 100644 +index 59f24ab35da5e3eb4d71dc9b3445abd6a2536266..e7fc241d879ec96862d9a82d784538f93e559051 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -51,7 +51,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {