mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
ce403193df
Upstream has released updates that appears to apply and compile correctly Paper Changes: ab347c4c9 Updated Upstream (Bukkit/CraftBukkit/Spigot) e2e09326d [Auto] Updated Upstream (Bukkit/CraftBukkit) 778d63b19 Add Gradle usage information to README (#3700) 25c14f76f Fix compile 78c855237 Updated Upstream (CraftBukkit) 8a4af269b fix EntityDismountEvent being fired on gen threads 55fb7da78 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d70195264 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 443fb80bf Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 d75c939e5 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 1431b1d6c Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 e4f2ec002 Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 122475aee Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 b98da027d Merge branch 'ver/1.16' of https://github.com/PaperMC/Paper into ver/1.16 a8ffecc74 Fix NPE and uuid lookup for player skulls
26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
From a39be3fb1c8b97c9dc58761e79799ca1cd78c907 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sun, 7 Jun 2020 13:16:02 -0500
|
|
Subject: [PATCH] Do not strip colors from death messages
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/EntityPlayer.java | 2 +-
|
|
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
|
|
index 42f3ef1ee6..b224ff153d 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(defaultMessage); // Purpur
|
|
org.bukkit.event.entity.PlayerDeathEvent event = CraftEventFactory.callPlayerDeathEvent(this, loot, deathmessage, keepInventory);
|
|
// Paper start - cancellable death event
|
|
if (event.isCancelled()) {
|
|
--
|
|
2.26.2
|
|
|