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

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0232-UPnP-Port-Forwarding.patch
View File

@@ -5,11 +5,11 @@ Subject: [PATCH] UPnP Port Forwarding
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3cbfbfeccb6603dc8dc60d85b8db19b61a736b72..1facde28d476bbdb86e33aac3d4f2754fe89c36f 100644
index d6faf01b6225fec11a4290592ac6ddf674ca6ce2..d88acaff65e5e19ce1afbbdb39459b07fda08ffc 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -293,6 +293,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// Spigot end
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
public static long currentTickLong = 0L; // Paper
public boolean lagging = false; // Purpur
+ protected boolean upnp = false; // Purpur
@@ -32,10 +32,10 @@ index 3cbfbfeccb6603dc8dc60d85b8db19b61a736b72..1facde28d476bbdb86e33aac3d4f2754
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 1a9b717c06ae93d996457399d35abb167a4c5f45..48d48ebd82a5a8caabadf92979d457a44408585c 100644
index f831481434d3bfdb7dba5068ee3fc55f78b98ca0..42f1f732673713291dc1d1c037c7043c3d50e390 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -283,6 +283,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -280,6 +280,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
return false;
}