From a97fdc48eb4a20687c30a5105859d19fd1bfd2ca Mon Sep 17 00:00:00 2001 From: Bierque Jason Date: Fri, 28 May 2021 20:25:43 +0200 Subject: [PATCH] Config to broadcast the death message to the affected player (#363) Co-authored-by: BillyGalbreath --- patches/server/0004-Purpur-config-files.patch | 6 ++-- patches/server/0005-Timings-stuff.patch | 2 +- .../0006-Barrels-and-enderchests-6-rows.patch | 2 +- patches/server/0009-AFK-API.patch | 2 +- .../0011-Configurable-server-mod-name.patch | 2 +- patches/server/0013-Lagging-threshold.patch | 2 +- .../0020-Alternative-Keepalive-Handling.patch | 2 +- ...-settings-suppressing-pointless-logs.patch | 2 +- ...033-Dont-send-useless-entity-packets.patch | 2 +- .../0057-Configurable-TPS-Catchup.patch | 2 +- patches/server/0077-Add-ping-command.patch | 2 +- ...-Add-allow-water-in-end-world-option.patch | 2 +- .../0088-Configurable-end-spike-seed.patch | 2 +- .../0089-Configurable-dungeon-seed.patch | 2 +- ...sable-mushroom-and-note-block-update.patch | 2 +- .../server/0101-Short-enderman-height.patch | 2 +- patches/server/0103-Ridables.patch | 2 +- ...ing-obsidian-valid-for-portal-frames.patch | 2 +- ...te-and-mending-enchantments-together.patch | 2 +- ...22-Add-tablist-suffix-option-for-afk.patch | 2 +- patches/server/0134-Add-demo-command.patch | 2 +- ...-disable-saving-projectiles-to-disk-.patch | 2 +- ...C-Configurable-disable-give-dropping.patch | 2 +- ...-climbing-should-not-bypass-cramming.patch | 2 +- .../0188-Allow-infinity-on-crossbows.patch | 2 +- ...-Config-to-allow-for-unsafe-enchants.patch | 2 +- ...-Config-to-change-max-number-of-bees.patch | 2 +- patches/server/0202-Add-credits-command.patch | 2 +- .../0203-Gamemode-extra-permissions.patch | 2 +- ...-change-broadcast-message-by-player.patch} | 31 +++++++++++++++---- ...-hidden-players-from-entity-selector.patch | 2 +- ...nfig-for-unverified-username-message.patch | 2 +- ...e-anvil-cumulative-cost-configurable.patch | 2 +- 33 files changed, 59 insertions(+), 40 deletions(-) rename patches/server/{0206-Allows-to-display-progress-messages-by-player-instea.patch => 0206-Allows-change-broadcast-message-by-player.patch} (56%) diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index ffa96f263..b174fbb7c 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -86,7 +86,7 @@ index d1591f8d0b45126acef5d24ddb41d76293f5b42d..b67914145517bd027f297cc4358d287b this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java new file mode 100644 -index 0000000000000000000000000000000000000000..2207d5ec00c0f6e4d332c0bbecbc224b24855927 +index 0000000000000000000000000000000000000000..74fc4fc2216cf82e1546ef3d567f2750b1240df1 --- /dev/null +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -0,0 +1,130 @@ @@ -145,8 +145,8 @@ index 0000000000000000000000000000000000000000..2207d5ec00c0f6e4d332c0bbecbc224b + commands = new HashMap<>(); + commands.put("purpur", new PurpurCommand("purpur")); + -+ version = getInt("config-version", 12); -+ set("config-version", 12); ++ version = getInt("config-version", 13); ++ set("config-version", 13); + + readConfig(PurpurConfig.class, null); + } diff --git a/patches/server/0005-Timings-stuff.patch b/patches/server/0005-Timings-stuff.patch index 96525f57f..7919aa80a 100644 --- a/patches/server/0005-Timings-stuff.patch +++ b/patches/server/0005-Timings-stuff.patch @@ -57,7 +57,7 @@ index 35810f42d7a0cd50a4cbe90e8d698fe57914c889..5e672a0660d0aceffcdb26d185590ca1 String hostName = "BrokenHost"; try { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 2207d5ec00c0f6e4d332c0bbecbc224b24855927..172545163646fb5cc28733af0e51b195c16898d6 100644 +index 74fc4fc2216cf82e1546ef3d567f2750b1240df1..108be36fc37c04eece6ccb93d19e58a31326ceb0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -127,4 +127,10 @@ public class PurpurConfig { diff --git a/patches/server/0006-Barrels-and-enderchests-6-rows.patch b/patches/server/0006-Barrels-and-enderchests-6-rows.patch index 84973036b..aceec8b11 100644 --- a/patches/server/0006-Barrels-and-enderchests-6-rows.patch +++ b/patches/server/0006-Barrels-and-enderchests-6-rows.patch @@ -123,7 +123,7 @@ index 7a6f150490bc3ef8a5ed43c401fd70bcc67f40f0..449d2c38abdd35b782a6732006eebb38 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 172545163646fb5cc28733af0e51b195c16898d6..5046628340f0f48587a790f7819fa368a849d979 100644 +index 108be36fc37c04eece6ccb93d19e58a31326ceb0..2f329bae9f09d0ed21a4538fba6b95919ec35887 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -7,6 +7,7 @@ import org.bukkit.Bukkit; diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch index 2aeb3b430..9c07d5e4a 100644 --- a/patches/server/0009-AFK-API.patch +++ b/patches/server/0009-AFK-API.patch @@ -215,7 +215,7 @@ index a7f2304acf8ee0a15d6eae8c42060e003be13ae7..fd56b2f15e570f266a79c25823a3b353 @Nullable diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 5046628340f0f48587a790f7819fa368a849d979..215d691de61c514bb75077d25428c2c2f56df0b5 100644 +index 2f329bae9f09d0ed21a4538fba6b95919ec35887..95b55fb93049c6686e13aab78ba1ae2b2fd5785b 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0011-Configurable-server-mod-name.patch b/patches/server/0011-Configurable-server-mod-name.patch index b425e0d7e..d4741aa2b 100644 --- a/patches/server/0011-Configurable-server-mod-name.patch +++ b/patches/server/0011-Configurable-server-mod-name.patch @@ -18,7 +18,7 @@ index b5706efbfbbcb48fc400f77350704d326b5bebc6..62edbac32e1835b5df0eebc5f7fed7b3 public CrashReport b(CrashReport crashreport) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 215d691de61c514bb75077d25428c2c2f56df0b5..7eadf925c4e4429fa63fb02af9e87bf2ed68efa6 100644 +index 95b55fb93049c6686e13aab78ba1ae2b2fd5785b..2442309843bb62e08ae13c46d335c65f7d072510 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -139,6 +139,11 @@ public class PurpurConfig { diff --git a/patches/server/0013-Lagging-threshold.patch b/patches/server/0013-Lagging-threshold.patch index 30ae37497..53caf3f2a 100644 --- a/patches/server/0013-Lagging-threshold.patch +++ b/patches/server/0013-Lagging-threshold.patch @@ -25,7 +25,7 @@ index 62edbac32e1835b5df0eebc5f7fed7b359a0e4a2..b20550d0dbb2f6450e5d26029819a960 } // Tuinity - replace logic diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7eadf925c4e4429fa63fb02af9e87bf2ed68efa6..60ef024891e78e18c64435b7ee8118075ce5fb90 100644 +index 2442309843bb62e08ae13c46d335c65f7d072510..089ae62c2189fe774796ecc6caf9961d3edb5ea3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -150,6 +150,11 @@ public class PurpurConfig { diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index ba5548c29..e6342adf1 100644 --- a/patches/server/0020-Alternative-Keepalive-Handling.patch +++ b/patches/server/0020-Alternative-Keepalive-Handling.patch @@ -68,7 +68,7 @@ index d1fe1242272a422b7b528876da0d76e1aa6f3eaa..8856ee8e0e7a3efda7921c0c8df9a2eb if (this.awaitingKeepAlive && packetplayinkeepalive.b() == this.h) { int i = (int) (SystemUtils.getMonotonicMillis() - this.lastKeepAlive); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 60ef024891e78e18c64435b7ee8118075ce5fb90..6e855980d32717119f30f39f4b47d86f8039ecc9 100644 +index 089ae62c2189fe774796ecc6caf9961d3edb5ea3..afd0c577069f2a856caf41bd2dd5187db4866fa3 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -155,6 +155,11 @@ public class PurpurConfig { diff --git a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch index 6f9d05321..2819f1b7a 100644 --- a/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch +++ b/patches/server/0024-Logger-settings-suppressing-pointless-logs.patch @@ -17,7 +17,7 @@ index dfdbc028f68ced197ad179248ed3b1e9d70ba057..a1ee1066108985a95abddb03ff447b5a } // CraftBukkit end diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 6e855980d32717119f30f39f4b47d86f8039ecc9..c5da5c0a6f68d4844ad8f59ad603611c909f8dfd 100644 +index afd0c577069f2a856caf41bd2dd5187db4866fa3..c7755cea5e8337af7acc96c6a34afa547b391035 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -178,4 +178,11 @@ public class PurpurConfig { diff --git a/patches/server/0033-Dont-send-useless-entity-packets.patch b/patches/server/0033-Dont-send-useless-entity-packets.patch index b749252e4..eb38bcacc 100644 --- a/patches/server/0033-Dont-send-useless-entity-packets.patch +++ b/patches/server/0033-Dont-send-useless-entity-packets.patch @@ -61,7 +61,7 @@ index 6aad662d823e0a64b8e18156b5f084399bc4f228..71df7a322bcb1f8050bf37a0c1a8dc1d this.tracker.c(entityplayer); entityplayer.c(this.tracker); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c5da5c0a6f68d4844ad8f59ad603611c909f8dfd..892f72c89af1b550305e2771f1ff5f470941faf8 100644 +index c7755cea5e8337af7acc96c6a34afa547b391035..6d5c2f469e4a7a13a69ac3f7a1dadeac6aabb531 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -179,6 +179,11 @@ public class PurpurConfig { diff --git a/patches/server/0057-Configurable-TPS-Catchup.patch b/patches/server/0057-Configurable-TPS-Catchup.patch index 9befe8762..d6d5052dd 100644 --- a/patches/server/0057-Configurable-TPS-Catchup.patch +++ b/patches/server/0057-Configurable-TPS-Catchup.patch @@ -24,7 +24,7 @@ index b20550d0dbb2f6450e5d26029819a9601acd05fb..e20a024e061ab0c255683d4f0947cb2f this.methodProfiler.exit(); this.methodProfiler.b(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 892f72c89af1b550305e2771f1ff5f470941faf8..0d16eaeea8b38329ffd6859b3ef93562a8fb86ce 100644 +index 6d5c2f469e4a7a13a69ac3f7a1dadeac6aabb531..8d27fff773b74014351bfbfeed0197272234be4a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -190,4 +190,9 @@ public class PurpurConfig { diff --git a/patches/server/0077-Add-ping-command.patch b/patches/server/0077-Add-ping-command.patch index 164313a97..41c2e37ed 100644 --- a/patches/server/0077-Add-ping-command.patch +++ b/patches/server/0077-Add-ping-command.patch @@ -67,7 +67,7 @@ index bbad2b1399d9d2e16bfa77563bd564f7c6f640d7..a85c4525335fa46bc23a6dd57cfaea1f List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0d16eaeea8b38329ffd6859b3ef93562a8fb86ce..969a4359dfb35e4cfeac26e1f6c700d7e9d142eb 100644 +index 8d27fff773b74014351bfbfeed0197272234be4a..b1b12a46f0b662aff24357b407b65124428ecfaa 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -133,10 +133,12 @@ public class PurpurConfig { diff --git a/patches/server/0083-Add-allow-water-in-end-world-option.patch b/patches/server/0083-Add-allow-water-in-end-world-option.patch index 4fd41fc08..fcb33886b 100644 --- a/patches/server/0083-Add-allow-water-in-end-world-option.patch +++ b/patches/server/0083-Add-allow-water-in-end-world-option.patch @@ -68,7 +68,7 @@ index 461c85b426aab30c34529897e55aa842b45d0555..486a03f2582d6ece2775cb2db127953d } else { world.setTypeUpdate(blockposition, Blocks.WATER.getBlockData()); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 969a4359dfb35e4cfeac26e1f6c700d7e9d142eb..5c65438c8b8acd2893346d26649c9fe142da05e9 100644 +index b1b12a46f0b662aff24357b407b65124428ecfaa..1a9d5409d38be0884c005524069c341a2dc27365 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -186,6 +186,11 @@ public class PurpurConfig { diff --git a/patches/server/0088-Configurable-end-spike-seed.patch b/patches/server/0088-Configurable-end-spike-seed.patch index 7c5807bc9..407a33bf6 100644 --- a/patches/server/0088-Configurable-end-spike-seed.patch +++ b/patches/server/0088-Configurable-end-spike-seed.patch @@ -25,7 +25,7 @@ index dd623702131eaa1a65937a19a0e986e865322258..54ac8444702c3cfc2bcbaa6c8bc40398 List list = worldgenfeatureendspikeconfiguration.c(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 5c65438c8b8acd2893346d26649c9fe142da05e9..90f1b46a8afd858eb0bc8a3723eda38c583d1ce3 100644 +index 1a9d5409d38be0884c005524069c341a2dc27365..7a95f27827cbf5d5f69e0f3d55f327bac4203573 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,5 +1,6 @@ diff --git a/patches/server/0089-Configurable-dungeon-seed.patch b/patches/server/0089-Configurable-dungeon-seed.patch index 8bccf35bb..f33b977b8 100644 --- a/patches/server/0089-Configurable-dungeon-seed.patch +++ b/patches/server/0089-Configurable-dungeon-seed.patch @@ -31,7 +31,7 @@ index 4a2e3af98ef3383678445c1bdf535203097558ee..363de0352804e6a778d4e6ee34609a94 int i = random.nextInt(2) + 2; int j = -i - 1; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 90f1b46a8afd858eb0bc8a3723eda38c583d1ce3..3a2476d78e74286636fb927258c583249aefd791 100644 +index 7a95f27827cbf5d5f69e0f3d55f327bac4203573..013f8a21be68f4e0470c0b873252bf21dd611127 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -142,10 +142,13 @@ public class PurpurConfig { diff --git a/patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch b/patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch index 1871ec941..5a6519437 100644 --- a/patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch +++ b/patches/server/0096-Add-option-to-disable-mushroom-and-note-block-update.patch @@ -91,7 +91,7 @@ index feec1db88b22a4d13ffd3034633da79ed41b94fe..148718f8f96d94e76a4a7a96d5955b62 } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 3a2476d78e74286636fb927258c583249aefd791..0f7d4aecadf319bef64793e4938736c531459e0e 100644 +index 013f8a21be68f4e0470c0b873252bf21dd611127..739e9724b316cfe1454ed32c13d91748ed0f180d 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -202,6 +202,13 @@ public class PurpurConfig { diff --git a/patches/server/0101-Short-enderman-height.patch b/patches/server/0101-Short-enderman-height.patch index 2cee4cb25..0de61b549 100644 --- a/patches/server/0101-Short-enderman-height.patch +++ b/patches/server/0101-Short-enderman-height.patch @@ -31,7 +31,7 @@ index 72142f5c777c6218050bc2b69891072d256ea57d..52aa47036acee2ec21ae2d6f4df634ec if (this.tryEscape(EndermanEscapeEvent.Reason.INDIRECT)) { // Paper start for (int i = 0; i < 64; ++i) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 0f7d4aecadf319bef64793e4938736c531459e0e..3b20793e3eb4349f8a4ce724f8fc0d6366bb28c2 100644 +index 739e9724b316cfe1454ed32c13d91748ed0f180d..3023df34803e93e4ce43fda6c0bee8de86fff5bc 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -4,6 +4,8 @@ import co.aikar.timings.TimingsManager; diff --git a/patches/server/0103-Ridables.patch b/patches/server/0103-Ridables.patch index bbcc93092..d510907ee 100644 --- a/patches/server/0103-Ridables.patch +++ b/patches/server/0103-Ridables.patch @@ -5633,7 +5633,7 @@ index a19a26a88f247d359354902efeece9923f3e0e0b..1119f60890784d953c2cd4e0078af4d0 return new Vec3D(this.x * d0, this.y * d1, this.z * d2); } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 3b20793e3eb4349f8a4ce724f8fc0d6366bb28c2..9789d0f9f73540a486befcdd4901014efeed8403 100644 +index 3023df34803e93e4ce43fda6c0bee8de86fff5bc..d242fc9828d36476c43bd2e5484de38047b35ae5 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -137,11 +137,13 @@ public class PurpurConfig { diff --git a/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch b/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch index b590241a0..8fac28f1a 100644 --- a/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch +++ b/patches/server/0105-Crying-obsidian-valid-for-portal-frames.patch @@ -42,7 +42,7 @@ index 3f8a674345bcad8289a48d2daa5e2a283528e952..3c35f5d171df518f491cad1f49882622 private final GeneratorAccess b; private final EnumDirection.EnumAxis c; diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 9789d0f9f73540a486befcdd4901014efeed8403..d783f6a9288db216a5eb812ab0cbf5c000edb1b5 100644 +index d242fc9828d36476c43bd2e5484de38047b35ae5..48bfafcfedc6b17d2cbd9693ec389d4c3d13de52 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -180,6 +180,7 @@ public class PurpurConfig { diff --git a/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch b/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch index 9bbb0575c..8d751f4f5 100644 --- a/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch +++ b/patches/server/0119-Allow-infinite-and-mending-enchantments-together.patch @@ -17,7 +17,7 @@ index bf9d6d0e593951aa5abc9aef6cf4803430ea18e5..29bebbccf8dd6ff8976d1bfdb4c2ddcf } } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index d783f6a9288db216a5eb812ab0cbf5c000edb1b5..24220d8a4e832771aa86619b660535867bb091de 100644 +index 48bfafcfedc6b17d2cbd9693ec389d4c3d13de52..4dda822c91bbe3109eaa7f727002ab3737547c77 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -198,6 +198,16 @@ public class PurpurConfig { diff --git a/patches/server/0122-Add-tablist-suffix-option-for-afk.patch b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch index 2f739f397..7509eae92 100644 --- a/patches/server/0122-Add-tablist-suffix-option-for-afk.patch +++ b/patches/server/0122-Add-tablist-suffix-option-for-afk.patch @@ -22,7 +22,7 @@ index d06bae9d71f23fccbfaf65c0fd9e9a550549432e..adab7cf319ed7d77bdd0196709741f67 ((WorldServer) world).everyoneSleeping(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 24220d8a4e832771aa86619b660535867bb091de..b903a19e0fcf008cb8358be2d5050c89d2addf28 100644 +index 4dda822c91bbe3109eaa7f727002ab3737547c77..909f0a283f0b7b1123fc7afde7fdf36a37f983e9 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -136,12 +136,14 @@ public class PurpurConfig { diff --git a/patches/server/0134-Add-demo-command.patch b/patches/server/0134-Add-demo-command.patch index abeae395f..30f702419 100644 --- a/patches/server/0134-Add-demo-command.patch +++ b/patches/server/0134-Add-demo-command.patch @@ -30,7 +30,7 @@ index edb6c0ab2826051b04e025a713d794dbc5de4792..0161657748d398b6827ef8bc2b00b8a6 public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7); public static final PacketPlayOutGameStateChange.a i = new PacketPlayOutGameStateChange.a(8); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b903a19e0fcf008cb8358be2d5050c89d2addf28..69d6d3fb4333531ea63acf5272ffa52ed296346f 100644 +index 909f0a283f0b7b1123fc7afde7fdf36a37f983e9..c5812b2c1160cfed927a23c9da4c8c913dab158c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -137,6 +137,7 @@ public class PurpurConfig { diff --git a/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch b/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch index 112f4b895..0f03f1099 100644 --- a/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch +++ b/patches/server/0139-Config-migration-disable-saving-projectiles-to-disk-.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: disable saving projectiles to disk -> diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 69d6d3fb4333531ea63acf5272ffa52ed296346f..457a20aee6f7aa25be052bec202bbcb8153612c0 100644 +index c5812b2c1160cfed927a23c9da4c8c913dab158c..f46abac134119031523e37f28b115dd46fbb8885 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -1,6 +1,7 @@ diff --git a/patches/server/0142-EMC-Configurable-disable-give-dropping.patch b/patches/server/0142-EMC-Configurable-disable-give-dropping.patch index 7d06e897a..59bb55abe 100644 --- a/patches/server/0142-EMC-Configurable-disable-give-dropping.patch +++ b/patches/server/0142-EMC-Configurable-disable-give-dropping.patch @@ -20,7 +20,7 @@ index a10207f7cb9455e29db7e6906cb2138ad5609a1f..9557fd12f87e7e825501759598eaee75 itemstack.setCount(1); entityitem = entityplayer.drop(itemstack, false, false, true); // Paper - Fix duplicating /give items on item drop cancel diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 457a20aee6f7aa25be052bec202bbcb8153612c0..521604b37ca61b849420f206fde88210b582cd3c 100644 +index f46abac134119031523e37f28b115dd46fbb8885..8c9a791195821cf9df393c8d3bf33ef6d0913e70 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -193,6 +193,11 @@ public class PurpurConfig { diff --git a/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch b/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch index b87b4c702..921942077 100644 --- a/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch +++ b/patches/server/0143-Config-migration-climbing-should-not-bypass-cramming.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Config migration: climbing should not bypass cramming diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 521604b37ca61b849420f206fde88210b582cd3c..116f17bcc02d15951fa248c6ce4e2cf3617034d4 100644 +index 8c9a791195821cf9df393c8d3bf33ef6d0913e70..78baa4e01538205001613bf6e1ab6fb88d91dec1 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -145,6 +145,17 @@ public class PurpurConfig { diff --git a/patches/server/0188-Allow-infinity-on-crossbows.patch b/patches/server/0188-Allow-infinity-on-crossbows.patch index 564f38276..1096dfac9 100644 --- a/patches/server/0188-Allow-infinity-on-crossbows.patch +++ b/patches/server/0188-Allow-infinity-on-crossbows.patch @@ -63,7 +63,7 @@ index cf41863bc8b0be9f2a73ca2dd02a4d414d4f230e..2b75432d74df4f627d08d32c6553bd1a private EnchantmentSlotType() {} diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 116f17bcc02d15951fa248c6ce4e2cf3617034d4..f469b27273883c56cee98fee464c4d1a32a31478 100644 +index 78baa4e01538205001613bf6e1ab6fb88d91dec1..226e6491589dc68a7cd7cba7969a2b38b92271fd 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -231,6 +231,7 @@ public class PurpurConfig { diff --git a/patches/server/0194-Config-to-allow-for-unsafe-enchants.patch b/patches/server/0194-Config-to-allow-for-unsafe-enchants.patch index a888769ea..330edcb42 100644 --- a/patches/server/0194-Config-to-allow-for-unsafe-enchants.patch +++ b/patches/server/0194-Config-to-allow-for-unsafe-enchants.patch @@ -56,7 +56,7 @@ index b2d28c2bf0a9e93d38583e2d734c12fed4f63d5d..63a6f63a2d3e03e74c314cdebf7cb61b Map map = Maps.newLinkedHashMap(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index f469b27273883c56cee98fee464c4d1a32a31478..b410d38a431f79971ca183b476115d9e85e1cd6e 100644 +index 226e6491589dc68a7cd7cba7969a2b38b92271fd..4947df56f3f7372dead7d5674d1327570dba00b0 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -232,6 +232,7 @@ public class PurpurConfig { diff --git a/patches/server/0199-Config-to-change-max-number-of-bees.patch b/patches/server/0199-Config-to-change-max-number-of-bees.patch index c21f11fb7..73c6b381d 100644 --- a/patches/server/0199-Config-to-change-max-number-of-bees.patch +++ b/patches/server/0199-Config-to-change-max-number-of-bees.patch @@ -18,7 +18,7 @@ index 80083a6666a28372946cf0e68ded44d075357f7d..58bf1008ab19340bce5111e006a8de0e public TileEntityBeehive() { super(TileEntityTypes.BEEHIVE); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index b410d38a431f79971ca183b476115d9e85e1cd6e..c0ef121956ad42bbb555eb8ee6c46b1845dd9e0d 100644 +index 4947df56f3f7372dead7d5674d1327570dba00b0..7ff63f18000ddd9c14a61adbbbb941740dbe2432 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -213,6 +213,7 @@ public class PurpurConfig { diff --git a/patches/server/0202-Add-credits-command.patch b/patches/server/0202-Add-credits-command.patch index b5b5e9a46..f39f8aa7f 100644 --- a/patches/server/0202-Add-credits-command.patch +++ b/patches/server/0202-Add-credits-command.patch @@ -30,7 +30,7 @@ index 0161657748d398b6827ef8bc2b00b8a63bf37c55..aaff933c5bf619303842ce6b9a9dc979 public static final PacketPlayOutGameStateChange.a g = new PacketPlayOutGameStateChange.a(6); public static final PacketPlayOutGameStateChange.a h = new PacketPlayOutGameStateChange.a(7); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index c0ef121956ad42bbb555eb8ee6c46b1845dd9e0d..e0228fb58149ac8a9430d54157d5e92c93618f22 100644 +index 7ff63f18000ddd9c14a61adbbbb941740dbe2432..556e46d3c489445fb31325b3f5bda8793b8c3664 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -161,6 +161,7 @@ public class PurpurConfig { diff --git a/patches/server/0203-Gamemode-extra-permissions.patch b/patches/server/0203-Gamemode-extra-permissions.patch index 284d8b966..b91c21020 100644 --- a/patches/server/0203-Gamemode-extra-permissions.patch +++ b/patches/server/0203-Gamemode-extra-permissions.patch @@ -69,7 +69,7 @@ index eea551a68ba44927cb23560b898dd2c17f041442..1b049bdc897aaf1f0cb9b6dfeaf3a1e4 return this.g; } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index e0228fb58149ac8a9430d54157d5e92c93618f22..56424e45c04e7165c0671f74cdcd0147d1069af7 100644 +index 556e46d3c489445fb31325b3f5bda8793b8c3664..84dbd4d9ac11817febc2f3d801f211b374e089e2 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -211,6 +211,11 @@ public class PurpurConfig { diff --git a/patches/server/0206-Allows-to-display-progress-messages-by-player-instea.patch b/patches/server/0206-Allows-change-broadcast-message-by-player.patch similarity index 56% rename from patches/server/0206-Allows-to-display-progress-messages-by-player-instea.patch rename to patches/server/0206-Allows-change-broadcast-message-by-player.patch index 5037fba49..f6738aa14 100644 --- a/patches/server/0206-Allows-to-display-progress-messages-by-player-instea.patch +++ b/patches/server/0206-Allows-change-broadcast-message-by-player.patch @@ -1,8 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: DoctaEnkoda Date: Mon, 3 May 2021 01:33:14 +0200 -Subject: [PATCH] Allows to display progress messages by player instead to - everyone on the server. +Subject: [PATCH] Allows change broadcast message by player diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java @@ -33,17 +32,37 @@ index a1ee1066108985a95abddb03ff447b5a14f4f85f..4720644ae82f76f835f14c0b3a00e7b7 // Paper end } } +diff --git a/src/main/java/net/minecraft/server/level/EntityPlayer.java b/src/main/java/net/minecraft/server/level/EntityPlayer.java +index 96520df171fadbc90c130555bd0c7139579f73d8..753fc239b9968d76541c536184b2039526d80005 100644 +--- a/src/main/java/net/minecraft/server/level/EntityPlayer.java ++++ b/src/main/java/net/minecraft/server/level/EntityPlayer.java +@@ -1038,7 +1038,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { + + }); + ScoreboardTeamBase scoreboardteambase = this.getScoreboardTeam(); +- ++ if (net.pl3x.purpur.PurpurConfig.deathMessageOnlyBroadcastToAffectedPlayer) this.sendMessage(ichatbasecomponent); else // Purpur + if (scoreboardteambase != null && scoreboardteambase.getDeathMessageVisibility() != ScoreboardTeamBase.EnumNameTagVisibility.ALWAYS) { + if (scoreboardteambase.getDeathMessageVisibility() == ScoreboardTeamBase.EnumNameTagVisibility.HIDE_FOR_OTHER_TEAMS) { + this.server.getPlayerList().a((EntityHuman) this, ichatbasecomponent); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 56424e45c04e7165c0671f74cdcd0147d1069af7..7e8654e4df61527f33d4fce2afdb14e29b90a4c2 100644 +index 84dbd4d9ac11817febc2f3d801f211b374e089e2..c735ebe56cf95edffb53f03a5c7a15bac446e583 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java -@@ -287,4 +287,9 @@ public class PurpurConfig { +@@ -287,4 +287,16 @@ public class PurpurConfig { private static void tpsCatchup() { tpsCatchup = getBoolean("settings.tps-catchup", tpsCatchup); } + + public static boolean advancementOnlyBroadcastToAffectedPlayer = false; -+ private static void advancementSettings() { -+ advancementOnlyBroadcastToAffectedPlayer = getBoolean("settings.advancement.only-broadcast-to-affected-player", advancementOnlyBroadcastToAffectedPlayer ); ++ public static boolean deathMessageOnlyBroadcastToAffectedPlayer = false; ++ private static void broadcastSettings() { ++ if (version < 13) { ++ boolean oldValue = getBoolean("settings.advancement.only-broadcast-to-affected-player", false); ++ set("settings.broadcasts.advancement.only-broadcast-to-affected-player", oldValue); ++ set("settings.advancement.only-broadcast-to-affected-player", null); ++ } ++ advancementOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.advancement.only-broadcast-to-affected-player", advancementOnlyBroadcastToAffectedPlayer); ++ deathMessageOnlyBroadcastToAffectedPlayer = getBoolean("settings.broadcasts.death.only-broadcast-to-affected-player", deathMessageOnlyBroadcastToAffectedPlayer); + } } diff --git a/patches/server/0209-Hide-hidden-players-from-entity-selector.patch b/patches/server/0209-Hide-hidden-players-from-entity-selector.patch index e555fb33c..277923e31 100644 --- a/patches/server/0209-Hide-hidden-players-from-entity-selector.patch +++ b/patches/server/0209-Hide-hidden-players-from-entity-selector.patch @@ -60,7 +60,7 @@ index ee3123ac8a568d915ca4e1b42fc1196c269b287e..82125185233bdc59ef93d376e7327180 + // Purpur end } diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 7e8654e4df61527f33d4fce2afdb14e29b90a4c2..61f385021e8e870a4cb1b9c2744105988c8b709a 100644 +index c735ebe56cf95edffb53f03a5c7a15bac446e583..9291b245dc7d7a8a7f458d9a447c03482c7fe22e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -212,8 +212,10 @@ public class PurpurConfig { diff --git a/patches/server/0218-Config-for-unverified-username-message.patch b/patches/server/0218-Config-for-unverified-username-message.patch index 692faa90a..424aca794 100644 --- a/patches/server/0218-Config-for-unverified-username-message.patch +++ b/patches/server/0218-Config-for-unverified-username-message.patch @@ -18,7 +18,7 @@ index 25437a993c02379fa43e5d46159cd9ba2aebf10f..f378d654a7fdd61ca31ca50ba45eff6a } } catch (AuthenticationUnavailableException authenticationunavailableexception) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 61f385021e8e870a4cb1b9c2744105988c8b709a..5a228c14a6e6335399f3436419deb51420082ad2 100644 +index 9291b245dc7d7a8a7f458d9a447c03482c7fe22e..d9b2fa1946d4b63e3a807154f485231937a0f2ea 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -164,6 +164,7 @@ public class PurpurConfig { diff --git a/patches/server/0219-Make-anvil-cumulative-cost-configurable.patch b/patches/server/0219-Make-anvil-cumulative-cost-configurable.patch index 2cb5bd914..21ee60ed7 100644 --- a/patches/server/0219-Make-anvil-cumulative-cost-configurable.patch +++ b/patches/server/0219-Make-anvil-cumulative-cost-configurable.patch @@ -18,7 +18,7 @@ index 77810fbb70bf2e1ad03c28c0d69ceaa63221d94c..e1cc66e382b2251e0fa60f777515d5a1 public void a(String s) { diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 5a228c14a6e6335399f3436419deb51420082ad2..ce9cbc3964ef626e7fe3baf59225114ca93b0b53 100644 +index d9b2fa1946d4b63e3a807154f485231937a0f2ea..a580b021c7d9727b82a67dedfc509c286feb8c7e 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -225,6 +225,7 @@ public class PurpurConfig {