Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 09:57:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
1eeb8ad1 Support components in ItemMeta (#3513)
ea8823ef Fix MOTD new line support (#3756)
4b5b20d4 Fix hex colours not being allowed in MOTD (#3755)
This commit is contained in:
William Blake Galbreath
2020-07-02 13:30:52 -05:00
parent 7833488f9e
commit 7a778f7212
3 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Paper

Submodule Paper updated: f32d7fb2d2...1eeb8ad14b

2
current-paper
View File

@@ -1 +1 @@
1.16.1--899ab13b8d00e0f43999b1ab959fc7db8388bd6b 1.16.1--4f5c5bbd9511d097bf08cb0c141f3cd78275b35e

17
patches/server/0057-Signs-allow-color-codes.patch
View File

@@ -1,15 +1,14 @@
From 60a3d9ccbc6c7fae94d8ab9c3c4362d1d8c422b2 Mon Sep 17 00:00:00 2001 From af34207d367275fdae976891afb02275ebca584b Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com> From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Thu, 6 Jun 2019 17:40:30 -0500 Date: Thu, 6 Jun 2019 17:40:30 -0500
Subject: [PATCH] Signs allow color codes Subject: [PATCH] Signs allow color codes
--- ---
.../net/minecraft/server/EntityPlayer.java | 1 + .../net/minecraft/server/EntityPlayer.java | 1 +
.../minecraft/server/IChatBaseComponent.java | 1 +
.../minecraft/server/PlayerConnection.java | 8 +++++++ .../minecraft/server/PlayerConnection.java | 8 +++++++
.../net/minecraft/server/TileEntitySign.java | 23 +++++++++++++++++++ .../net/minecraft/server/TileEntitySign.java | 23 +++++++++++++++++++
.../net/pl3x/purpur/PurpurWorldConfig.java | 3 +++ .../net/pl3x/purpur/PurpurWorldConfig.java | 3 +++
5 files changed, 36 insertions(+) 4 files changed, 35 insertions(+)
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 07f8f0fa7..3556e86fd 100644 index 07f8f0fa7..3556e86fd 100644
@@ -23,18 +22,6 @@ index 07f8f0fa7..3556e86fd 100644
} }
public int nextContainerCounter() { // CraftBukkit - void -> int public int nextContainerCounter() { // CraftBukkit - void -> int
diff --git a/src/main/java/net/minecraft/server/IChatBaseComponent.java b/src/main/java/net/minecraft/server/IChatBaseComponent.java
index fd3e6cda6..750896fc8 100644
--- a/src/main/java/net/minecraft/server/IChatBaseComponent.java
+++ b/src/main/java/net/minecraft/server/IChatBaseComponent.java
@@ -344,6 +344,7 @@ public interface IChatBaseComponent extends Message, IChatFormatted, Iterable<IC
return jsonobject;
}
+ public static String toJson(IChatBaseComponent ichatbasecomponent) { return a(ichatbasecomponent); } // Purpur - OBFHELPER
public static String a(IChatBaseComponent ichatbasecomponent) {
return IChatBaseComponent.ChatSerializer.a.toJson(ichatbasecomponent);
}
diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
index 36519882f..c425578c1 100644 index 36519882f..c425578c1 100644
--- a/src/main/java/net/minecraft/server/PlayerConnection.java --- a/src/main/java/net/minecraft/server/PlayerConnection.java