mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-19 17:37:42 +01:00
d652384e4a
Upstream has released updates that appears to apply and compile correctly Paper Changes: 1c446c22 Fix CME when adding a passenger during Spawn events (#4616) f3927b25 Fix "Not a string" Map Conversion spam - Fixes #3901 1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361 6b22219c Remove unnecessary space for provided plugins, fixes #4608 3ece9036 [CI-SKIP] [Auto] Rebuild Patches 551fac7e Fix deop kicking non-whitelisted player when white list is not enabled faf8eb03 Updated Upstream (CraftBukkit) (#4622)
60 lines
3.5 KiB
Diff
60 lines
3.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Fri, 10 Jul 2020 09:40:30 -0500
|
|
Subject: [PATCH] ALlow color codes in books
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
index 668bd7261c..de3d692084 100644
|
|
--- a/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
|
|
@@ -937,12 +937,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
itemstack2.setTag(nbttagcompound.clone());
|
|
}
|
|
|
|
+ boolean hasPerm = getPlayer().hasPermission("purpur.book.color.edit") || getPlayer().hasPermission("purpur.book.color.sign");
|
|
itemstack2.a("author", (NBTBase) NBTTagString.a(this.player.getDisplayName().getString()));
|
|
- itemstack2.a("title", (NBTBase) NBTTagString.a(itemstack.getTag().getString("title")));
|
|
+ itemstack2.a("title", (NBTBase) NBTTagString.a(color(itemstack.getTag().getString("title"), hasPerm))); // Purpur - sign book
|
|
NBTTagList nbttaglist = itemstack.getTag().getList("pages", 8);
|
|
|
|
for (int i = 0; i < nbttaglist.size(); ++i) {
|
|
- String s = nbttaglist.getString(i);
|
|
+ String s = color(nbttaglist.getString(i), hasPerm);// Purpur - sign book
|
|
ChatComponentText chatcomponenttext = new ChatComponentText(s);
|
|
|
|
s = IChatBaseComponent.ChatSerializer.a((IChatBaseComponent) chatcomponenttext);
|
|
@@ -954,7 +955,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
} else {
|
|
// Paper start - dont mutate players current item, set it from the event
|
|
ItemStack newBook = itemstack1.cloneItemStack();
|
|
- newBook.getOrCreateTagAndSet("pages", (NBTBase)itemstack.getTag().getList("pages", 8));
|
|
+ // Purpur start - edit book
|
|
+ boolean hasPerm = getPlayer().hasPermission("purpur.book.color.edit");
|
|
+ NBTTagList nbttaglist = itemstack.getTag().getList("pages", 8);
|
|
+ for (int i = 0; i < nbttaglist.size(); ++i) {
|
|
+ nbttaglist.set(i, NBTTagString.create(color(nbttaglist.getString(i), hasPerm, false)));
|
|
+ }
|
|
+ newBook.getOrCreateTagAndSet("pages", nbttaglist);
|
|
+ // Purpur end - edit book
|
|
this.player.setSlot(enumitemslot, CraftEventFactory.handleEditBookEvent(player, enumitemslot, itemstack1, newBook));
|
|
// Paper end
|
|
}
|
|
@@ -964,6 +972,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
|
}
|
|
}
|
|
|
|
+ // Purpur start
|
|
+ private String color(String str, boolean hasPerm) {
|
|
+ return color(str, hasPerm, true);
|
|
+ }
|
|
+
|
|
+ private String color(String str, boolean hasPerm, boolean parseHex) {
|
|
+ return hasPerm ? org.bukkit.ChatColor.color(str, parseHex) : str;
|
|
+ }
|
|
+ // Purpur end
|
|
+
|
|
@Override
|
|
public void a(PacketPlayInEntityNBTQuery packetplayinentitynbtquery) {
|
|
PlayerConnectionUtils.ensureMainThread(packetplayinentitynbtquery, this, this.player.getWorldServer());
|