From 2c821a73ec91a4920e63e29f2477f39275b3e507 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 16 Jul 2020 14:01:08 -0500 Subject: [PATCH] Remove colored death messages patch --- ...eport-to-spawn-if-outside-world-bor.patch} | 4 ++-- ...not-strip-colors-from-death-messages.patch | 19 ------------------- ...ty.patch => 0109-Squid-EAR-immunity.patch} | 4 ++-- ...=> 0110-Configurable-end-spike-seed.patch} | 0 ...h => 0111-Configurable-dungeon-seed.patch} | 0 ...atch => 0112-Phantoms-burn-in-light.patch} | 0 ...0113-Configurable-villager-breeding.patch} | 0 ... 0114-Redstone-deactivates-spawners.patch} | 0 ...ch => 0115-Totems-work-in-inventory.patch} | 0 9 files changed, 4 insertions(+), 23 deletions(-) rename patches/server/{0109-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch => 0108-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch} (96%) delete mode 100644 patches/server/0108-Do-not-strip-colors-from-death-messages.patch rename patches/server/{0110-Squid-EAR-immunity.patch => 0109-Squid-EAR-immunity.patch} (95%) rename patches/server/{0111-Configurable-end-spike-seed.patch => 0110-Configurable-end-spike-seed.patch} (100%) rename patches/server/{0112-Configurable-dungeon-seed.patch => 0111-Configurable-dungeon-seed.patch} (100%) rename patches/server/{0113-Phantoms-burn-in-light.patch => 0112-Phantoms-burn-in-light.patch} (100%) rename patches/server/{0114-Configurable-villager-breeding.patch => 0113-Configurable-villager-breeding.patch} (100%) rename patches/server/{0115-Redstone-deactivates-spawners.patch => 0114-Redstone-deactivates-spawners.patch} (100%) rename patches/server/{0116-Totems-work-in-inventory.patch => 0115-Totems-work-in-inventory.patch} (100%) diff --git a/patches/server/0109-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0108-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch similarity index 96% rename from patches/server/0109-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch rename to patches/server/0108-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch index 96a8dae9f..667e527f7 100644 --- a/patches/server/0109-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch +++ b/patches/server/0108-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java -index 22b13896d0..3a2a45a659 100644 +index 22b13896d..3a2a45a65 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity { @@ -17,7 +17,7 @@ index 22b13896d0..3a2a45a659 100644 } } diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 87b8630315..63d4cf5c44 100644 +index 87b863031..63d4cf5c4 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -180,6 +180,11 @@ public class PurpurWorldConfig { diff --git a/patches/server/0108-Do-not-strip-colors-from-death-messages.patch b/patches/server/0108-Do-not-strip-colors-from-death-messages.patch deleted file mode 100644 index 57c01a599..000000000 --- a/patches/server/0108-Do-not-strip-colors-from-death-messages.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: William Blake Galbreath -Date: Sat, 11 Jul 2020 19:48:32 -0500 -Subject: [PATCH] Do not strip colors from death messages - - -diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java -index 9ae4c63ade..be66bf6c61 100644 ---- a/src/main/java/net/minecraft/server/EntityPlayer.java -+++ b/src/main/java/net/minecraft/server/EntityPlayer.java -@@ -662,7 +662,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { - - IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage(); - -- String deathmessage = defaultMessage.getString(); -+ String deathmessage = org.bukkit.craftbukkit.util.CraftChatMessage.fromComponent(IChatBaseComponent.ChatSerializer.jsonToComponent(net.md_5.bungee.chat.ComponentSerializer.toString(net.md_5.bungee.api.chat.TextComponent.fromLegacyText(net.md_5.bungee.api.chat.TranslatableComponent.toLegacyText(net.md_5.bungee.chat.ComponentSerializer.parse(IChatBaseComponent.ChatSerializer.componentToJson(defaultMessage))))))); // Purpur - org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); - // Paper start - cancellable death event - if (event.isCancelled()) { diff --git a/patches/server/0110-Squid-EAR-immunity.patch b/patches/server/0109-Squid-EAR-immunity.patch similarity index 95% rename from patches/server/0110-Squid-EAR-immunity.patch rename to patches/server/0109-Squid-EAR-immunity.patch index fae307aca..98b6efbc9 100644 --- a/patches/server/0110-Squid-EAR-immunity.patch +++ b/patches/server/0109-Squid-EAR-immunity.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Squid EAR immunity diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java -index 63d4cf5c44..f7be1373ce 100644 +index 63d4cf5c4..f7be1373c 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -629,6 +629,11 @@ public class PurpurWorldConfig { @@ -21,7 +21,7 @@ index 63d4cf5c44..f7be1373ce 100644 public boolean strayRidableInWater = false; private void straySettings() { diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java -index da4c49daf4..ab10206d01 100644 +index da4c49daf..ab10206d0 100644 --- a/src/main/java/org/spigotmc/ActivationRange.java +++ b/src/main/java/org/spigotmc/ActivationRange.java @@ -378,6 +378,7 @@ public class ActivationRange diff --git a/patches/server/0111-Configurable-end-spike-seed.patch b/patches/server/0110-Configurable-end-spike-seed.patch similarity index 100% rename from patches/server/0111-Configurable-end-spike-seed.patch rename to patches/server/0110-Configurable-end-spike-seed.patch diff --git a/patches/server/0112-Configurable-dungeon-seed.patch b/patches/server/0111-Configurable-dungeon-seed.patch similarity index 100% rename from patches/server/0112-Configurable-dungeon-seed.patch rename to patches/server/0111-Configurable-dungeon-seed.patch diff --git a/patches/server/0113-Phantoms-burn-in-light.patch b/patches/server/0112-Phantoms-burn-in-light.patch similarity index 100% rename from patches/server/0113-Phantoms-burn-in-light.patch rename to patches/server/0112-Phantoms-burn-in-light.patch diff --git a/patches/server/0114-Configurable-villager-breeding.patch b/patches/server/0113-Configurable-villager-breeding.patch similarity index 100% rename from patches/server/0114-Configurable-villager-breeding.patch rename to patches/server/0113-Configurable-villager-breeding.patch diff --git a/patches/server/0115-Redstone-deactivates-spawners.patch b/patches/server/0114-Redstone-deactivates-spawners.patch similarity index 100% rename from patches/server/0115-Redstone-deactivates-spawners.patch rename to patches/server/0114-Redstone-deactivates-spawners.patch diff --git a/patches/server/0116-Totems-work-in-inventory.patch b/patches/server/0115-Totems-work-in-inventory.patch similarity index 100% rename from patches/server/0116-Totems-work-in-inventory.patch rename to patches/server/0115-Totems-work-in-inventory.patch