mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 09:57:43 +01:00
Updated Upstream (Paper & Pufferfish)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@eff22eb Ensure players are removed from pendingLogin Pufferfish Changes: pufferfish-gg/Pufferfish@31d0ff3 Updated Upstream (Paper) pufferfish-gg/Pufferfish@4882a95 Fix PAPI edge-case pufferfish-gg/Pufferfish@254c002 Updated Upstream (Paper) pufferfish-gg/Pufferfish@4b26a0b Updated Upstream (Paper) pufferfish-gg/Pufferfish@2c1e02e Updated Upstream (Paper) pufferfish-gg/Pufferfish@3888607 Update DAB entities
This commit is contained in:
@@ -32,10 +32,10 @@ index d8e0bac3de2f7810d7af82fe6c5c00870fef3155..d950b72b7287b857cb849c1a2fc931fa
|
||||
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 4bd120ab4d19052ed769c4dd8a682650f0020bbc..de711300db4b9abe30bddb430875d4503355e9e2 100644
|
||||
index 19bf680e222d7f91a0e7f67b29e3a5e38a35c1e7..ac860bf07d0fca29adad3de79396055f957a64e9 100644
|
||||
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
|
||||
@@ -284,6 +284,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
@@ -283,6 +283,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
|
||||
DedicatedServer.LOGGER.warn("Perhaps a server is already running on that port?");
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user