SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream B/CB/S

Browse Source
This commit is contained in:
Zach Brown
2017-05-15 11:25:20 -05:00
parent b75e22ccb2
commit f7d8aa4188
26 changed files with 61 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Spigot-Server-Patches/Add-setting-for-proxy-online-mode-status.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add setting for proxy online mode status
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 0140d1981..c758bde3f 100644
index 011cbf5e3..cf06f8ac3 100644
--- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -0,0 +0,0 @@ public class PaperConfig {
@@ -33,7 +33,7 @@ index b943a9b20..8f3b93dc1 100644
} else {
String[] astring1 = astring;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index f4fd25c29..8f8f5e36f 100644
index 488c58755..a1f0ef672 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -0,0 +0,0 @@ public final class CraftServer implements Server {