Update Upstream (Paper)

yadda yadda..

I haven't added a task to detect Paper's commits yet, and i dont feel like doing this manually.. so yeah. if you care, just look at paper's github history :P
This commit is contained in:
William Blake Galbreath
2021-06-22 09:52:42 -05:00
parent 5d69f6f5b5
commit b0bdfa48ac
13 changed files with 39 additions and 39 deletions

View File

@@ -76,7 +76,7 @@ index a1d5c0f8fe2adb2ee56f3217e089211ec7c61eb0..43a88bc58716eef4040584944f52893c
if (outputStream != null) {
try {
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e..736a7baab17b26319f2aa39ad059e2f5a7ee16cf 100644
index a24bab6095b85fe208bb0f467b267a9d0680c6fc..4690a1c926dd695c98ac8012f271e1a71a0d3d6d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1649,7 +1649,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -89,10 +89,10 @@ index 3bf39c2d2aa3fc4fd0815dacea57e4899ec0da0e..736a7baab17b26319f2aa39ad059e2f5
public SystemReport fillSystemReport(SystemReport systemreport) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index eeefbb86cb88bd1b132bb6e22b4a4572cfb5e22c..674eccb7db4982adc28d6878ed8d5b28282b80b1 100644
index 6a1fd7a983724d9e16e8aef06052108ba7ed46f1..c70d34e0359c3e1c3a3544622d1215affc4f1d5b 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -279,11 +279,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -280,11 +280,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
// Spigot start