Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use CraftChatMessage instead of Mojang's stuff

Browse Source
This commit is contained in:
William Blake Galbreath
2020-06-12 03:20:25 -05:00
parent dc980f0950
commit 4e18e5d1e0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0115-Do-not-strip-colors-from-death-messages.patch
View File

@@ -1,4 +1,4 @@
From 29f5172989a80f3eec58bc734b4abfeb27aeb76c Mon Sep 17 00:00:00 2001 From f6dfdc9119326b17079bd9b9fc5e52b2766b19d8 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com> From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sun, 7 Jun 2020 13:16:02 -0500 Date: Sun, 7 Jun 2020 13:16:02 -0500
Subject: [PATCH] Do not strip colors from death messages Subject: [PATCH] Do not strip colors from death messages
@@ -8,7 +8,7 @@ Subject: [PATCH] Do not strip colors from death messages
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 6572177c55..98e268c350 100644 index 6572177c55..a1333c4371 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java --- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -617,7 +617,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting { @@ -617,7 +617,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -16,7 +16,7 @@ index 6572177c55..98e268c350 100644
IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage(); IChatBaseComponent defaultMessage = this.getCombatTracker().getDeathMessage();
- String deathmessage = defaultMessage.getString(); - String deathmessage = defaultMessage.getString();
+ String deathmessage = defaultMessage.getLegacyString(); // Purpur + String deathmessage = org.bukkit.craftbukkit.util.CraftChatMessage.fromComponent(defaultMessage); // Purpur
org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory); org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
// Paper start - cancellable death event // Paper start - cancellable death event
if (event.isCancelled()) { if (event.isCancelled()) {