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:
c096fe19 Port 20w15a Villager AI optimizations
832687de Restore preventing saving bad entities patch to full effect
df8eedee Restore Optimize Pathfinding patch
97b1cc36 Allow shutting down server during a watchdog hang gracefully
06044e24 Async command map building
This commit is contained in:
William Blake Galbreath
2020-04-12 17:33:46 -05:00
parent b6d5b8200e
commit 2243be4513
26 changed files with 62 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
patches/server/0089-UPnP-Port-Forwarding-Service.patch
View File

@@ -1,4 +1,4 @@
From 3f95f3fb3a8ab2517225ece2f5ec447c58128be3 Mon Sep 17 00:00:00 2001
From 2a12603d40aef4ce8c5de8d7603ffbcbd84b292f 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
@@ -6,11 +6,11 @@ Subject: [PATCH] UPnP Port Forwarding Service
---
pom.xml | 10 ++++
.../net/minecraft/server/DedicatedServer.java | 25 ++++++++++
.../net/minecraft/server/MinecraftServer.java | 11 +++++
.../net/minecraft/server/MinecraftServer.java | 12 +++++
.../java/net/pl3x/purpur/PurpurConfig.java | 5 ++
.../net/pl3x/purpur/gui/info/JInfoPanel.java | 3 ++
.../pl3x/purpur/gui/info/UPnPComponent.java | 47 +++++++++++++++++++
6 files changed, 101 insertions(+)
6 files changed, 102 insertions(+)
create mode 100644 src/main/java/net/pl3x/purpur/gui/info/UPnPComponent.java
diff --git a/pom.xml b/pom.xml
@@ -78,7 +78,7 @@ index bd9c123d56..7e8286b573 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 1577308be6..2a3b4f309c 100644
index 69970e0ab9..fab3e3d784 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -186,6 +186,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -89,7 +89,7 @@ index 1577308be6..2a3b4f309c 100644
public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
super("Server");
@@ -796,6 +797,16 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -796,6 +797,17 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
}
// Spigot end
com.destroystokyo.paper.io.PaperFileIOThread.Holder.INSTANCE.close(true, true); // Paper
@@ -103,9 +103,10 @@ index 1577308be6..2a3b4f309c 100644
+ }
+ }
+ // Purpur end
+
System.exit(0); // Paper
}
public String getServerIp() {
diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
index 16f5c9d372..c4ec515557 100644
--- a/src/main/java/net/pl3x/purpur/PurpurConfig.java