Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 17:07: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:
01b965e0 Fix getChunkAtIfCachedImmediately (#2915)
0a897d6e Rebuild patches
5792c862 Updated Upstream (Bukkit/CraftBukkit/Spigot)
c9eebbb8 Fix Player#applyMending NPE (#2917)
d16a5d88 Performance patches prerequisite (#2802)
This commit is contained in:
William Blake Galbreath
2020-01-29 21:58:09 -06:00
parent 8439e5b604
commit ddf1f8a586
17 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/server/0086-Make-the-GUI-better.patch
View File

@@ -1,4 +1,4 @@
From e61e156fbc28b8c3ec867428fa4814df04e78b07 Mon Sep 17 00:00:00 2001
From 706430e6dde42ea1db8fe1ea7d66602fb31f8477 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 16 Jan 2020 14:59:16 -0600
Subject: [PATCH] Make the GUI better
@@ -24,7 +24,7 @@ Subject: [PATCH] Make the GUI better
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 8b5f4cab0..aec6040c8 100644
index d70c8cab2b..61ccb6079e 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -51,7 +51,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -36,7 +36,7 @@ index 8b5f4cab0..aec6040c8 100644
// CraftBukkit start - Signature changed
public DedicatedServer(joptsimple.OptionSet options, DedicatedServerSettings dedicatedserversettings, DataFixer datafixer, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
@@ -413,7 +413,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -420,7 +420,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@Override
public void exit() {
if (this.p != null) {
@@ -45,7 +45,7 @@ index 8b5f4cab0..aec6040c8 100644
}
if (this.remoteControlListener != null) {
@@ -512,7 +512,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -519,7 +519,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
public void bc() {
if (this.p == null) {
@@ -55,7 +55,7 @@ index 8b5f4cab0..aec6040c8 100644
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9d5ef40a0..105ac8a04 100644
index 9d5ef40a03..105ac8a040 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -105,7 +105,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -77,7 +77,7 @@ index 9d5ef40a0..105ac8a04 100644
}
diff --git a/src/main/java/net/pl3x/purpur/gui/ColorPane.java b/src/main/java/net/pl3x/purpur/gui/ColorPane.java
new file mode 100644
index 000000000..d5d5766e1
index 0000000000..d5d5766e1d
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ColorPane.java
@@ -0,0 +1,126 @@
@@ -209,7 +209,7 @@ index 000000000..d5d5766e1
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java b/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java
new file mode 100644
index 000000000..a728f46e6
index 0000000000..a728f46e6c
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ConsolePanel.java
@@ -0,0 +1,128 @@
@@ -343,7 +343,7 @@ index 000000000..a728f46e6
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java b/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java
new file mode 100644
index 000000000..c97a6f7dc
index 0000000000..c97a6f7dc3
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/PlayerListComponent.java
@@ -0,0 +1,27 @@
@@ -376,7 +376,7 @@ index 000000000..c97a6f7dc
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/ServerGUI.java b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
new file mode 100644
index 000000000..a779fea68
index 0000000000..a779fea689
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/ServerGUI.java
@@ -0,0 +1,121 @@
@@ -503,7 +503,7 @@ index 000000000..a779fea68
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
new file mode 100644
index 000000000..b1ea91b49
index 0000000000..b1ea91b49b
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMDetails.java
@@ -0,0 +1,52 @@
@@ -561,7 +561,7 @@ index 000000000..b1ea91b49
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java b/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java
new file mode 100644
index 000000000..7623088ba
index 0000000000..7623088bae
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/RAMGraph.java
@@ -0,0 +1,179 @@
@@ -746,7 +746,7 @@ index 000000000..7623088ba
+}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
new file mode 100644
index 000000000..c4519794c
index 0000000000..c4519794c9
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
@@ -0,0 +1,42 @@
@@ -793,7 +793,7 @@ index 000000000..c4519794c
+ }
+}
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index a9bb98765..707ade70a 100644
index a9bb987652..707ade70a4 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -2,7 +2,16 @@