Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47: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:
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

16
patches/server/0097-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 81c7a70af91041e318331cd9b6861085d7e898fe Mon Sep 17 00:00:00 2001
From 05e998cef7295ffb4bdfbd3d237d586b17b6d187 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -14,7 +14,7 @@ Subject: [PATCH] UPnP Port Forwarding Service
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
index 37ff489db..c886104c5 100644
index 37ff489db8..c886104c5d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,12 @@
@@ -42,10 +42,10 @@ index 37ff489db..c886104c5 100644
<pluginRepositories>
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index aec6040c8..c04940d0a 100644
index 61ccb6079e..a85df1ff49 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -231,6 +231,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -238,6 +238,31 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}
@@ -78,7 +78,7 @@ index aec6040c8..c04940d0a 100644
// this.a((PlayerList) (new DedicatedPlayerList(this))); // Spigot - moved up
server.loadPlugins();
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 105ac8a04..d36bac5d7 100644
index 105ac8a040..d36bac5d74 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -181,6 +181,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -107,7 +107,7 @@ index 105ac8a04..d36bac5d7 100644
public String getServerIp() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 544c68b0d..917f6503d 100644
index 544c68b0d8..917f6503d2 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
+++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
@@ -137,6 +137,11 @@ public class PurpurConfig {
@@ -123,7 +123,7 @@ index 544c68b0d..917f6503d 100644
private static void tickLoopSettings() {
laggingThreshold = getDouble("settings.lagging-threshold", laggingThreshold);
diff --git a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
index c4519794c..2d9d1859d 100644
index c4519794c9..2d9d1859d9 100644
--- a/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
+++ b/src/main/java/net/pl3x/purpur/gui/info/ServerInfoPanel.java
@@ -11,6 +11,7 @@ public class ServerInfoPanel extends JPanel {
@@ -153,7 +153,7 @@ index c4519794c..2d9d1859d 100644
}
diff --git a/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
new file mode 100644
index 000000000..af6a7e18f
index 0000000000..af6a7e18f3
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
@@ -0,0 +1,45 @@