SteamWar/Paper
10
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
2018-01-10 23:31:19 -06:00
parent 5513c9377d
commit c93e1ee068
230 changed files with 474 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Spigot-Server-Patches/Handle-plugin-prefixes-using-Log4J-configuration.patch
View File

@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
the plugin logger.
diff --git a/pom.xml b/pom.xml
index aff997468..dfb006aa0 100644
index 9ce02242..16baff46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -0,0 +0,0 @@
@@ -28,7 +28,7 @@ index aff997468..dfb006aa0 100644
<!-- Paper - Add additional Log4J dependencies -->
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index 9ce3e1365..cc1f3ac96 100644
index 9ce3e136..cc1f3ac9 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index 9ce3e1365..cc1f3ac96 100644
public static int playerShuffle;
diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
index 08b6bb7f9..9f8334376 100644
index 08b6bb7f..9f833437 100644
--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
@@ -0,0 +0,0 @@