Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 18:37:42 +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:
d6eda567 Provide a useful PluginClassLoader#toString
a3fdafbd Restore Serialization Improvements again, wasn't an issue.
0e441c79 Revert "Improve Chat Component Legacy Serialization more"
53ef67b8 Improve Chat Component Legacy Serialization more
afc1fcfc Fix serialization of colors from components
eaa76a31 Add Villager Tasks to EAR inactive tick to keep behavior
357b52fd Improve Chunk Prioritization / Load Order
a76bc402 Improve Chunk Status Transition Speed
7a2b345b Synchronize DataPaletteBlock instead of ReentrantLock
This commit is contained in:
William Blake Galbreath
2020-05-31 18:20:17 -05:00
parent a032d548bf
commit c2c6a6efd9
13 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/server/0004-Add-language-asset-purpur.lang.patch
View File

@@ -1,4 +1,4 @@
From 2eebb2917735c5dbb2fee924861f3da007d84acf Mon Sep 17 00:00:00 2001
From 16fd129dea27af5866c4ff2281febb202873f9ac Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 26 Mar 2020 13:17:09 -0500
Subject: [PATCH] Add language asset purpur.lang
@@ -12,10 +12,10 @@ Subject: [PATCH] Add language asset purpur.lang
create mode 100644 src/main/resources/purpur.lang
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index d60f659b3..4b88a74ff 100644
index c88177b776..8c60e565ec 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -1561,6 +1561,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -1570,6 +1570,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
}
public void a(IChatBaseComponent ichatbasecomponent, ChatMessageType chatmessagetype) {
@@ -24,7 +24,7 @@ index d60f659b3..4b88a74ff 100644
if (!future.isSuccess() && (chatmessagetype == ChatMessageType.GAME_INFO || chatmessagetype == ChatMessageType.SYSTEM)) {
boolean flag = true;
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
index 601273933..75707adcd 100644
index 6012739331..75707adcd7 100644
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
@@ -15,18 +15,41 @@ import java.util.Map.Entry;
@@ -104,7 +104,7 @@ index 601273933..75707adcd 100644
+ // Purpur end
}
diff --git a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
index 7d983d9a5..36260e0ec 100644
index 7d983d9a54..36260e0ec8 100644
--- a/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
+++ b/src/main/java/net/pl3x/purpur/command/PurpurCommand.java
@@ -1,5 +1,6 @@
@@ -125,7 +125,7 @@ index 7d983d9a5..36260e0ec 100644
for (WorldServer world : console.getWorlds()) {
diff --git a/src/main/resources/purpur.lang b/src/main/resources/purpur.lang
new file mode 100644
index 000000000..0967ef424
index 0000000000..0967ef424b
--- /dev/null
+++ b/src/main/resources/purpur.lang
@@ -0,0 +1 @@