Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
cae142b85 Enable Hex colors on PaperAdventure.LEGACY_SECTION_UXRC, and use it for sending messages to console command sender (#5230)
c1635eabb PlayerDeathEvent#getDeathMessage should provide translation for legacy reasons #5227
3f74af202 Fix Log4J converter not parsing hex without named colors (#5228)
This commit is contained in:
jmp
2021-02-22 23:03:53 -08:00
parent 274c7b2ccc
commit 868c9cafec
15 changed files with 36 additions and 25 deletions

View File

@@ -3203,7 +3203,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 fd923594c67f51cfd77ca22f5b6664a3b7136e7e..f4d971448c91d2814055eea9f13426f1225c3e21 100644
index fcf8f988c1dbc7798e3c1b837de33b3049b33a2f..cfbe3c1c96e6406219c5f186ae15e178d877dfd6 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -512,6 +512,15 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -6381,7 +6381,7 @@ index 744e6351c58e5aa4a0c668f2ff1adb76a3dc0822..a3b810556e306bc2be65c7811cfa7806
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index a6d9212da2821d12449b0405dd360185388eefe5..6eece873dc948c89f8431a6f11e4a940bf6ca476 100644
index ee325757c79d3dc6db6bcc80c32a371e064ef24d..fefac469e4c8b803cd8e8c104103fad586ff2998 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -527,6 +527,18 @@ public class CraftEventFactory {