mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update upstream

Browse source
This commit is contained in:
Aikar 2017-06-09 08:29:44 -04:00
commit e68554e5c6
10 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Spigot-Server-Patches/Paper-Metrics.patch
View file

@ -623,7 +623,7 @@ index 000000000..9389f9a8c
+ }
+}
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index 328ff012b..1594d7ca4 100644
index 3d8ee9ed3..5ab2cf6ee 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 {
@ -647,7 +647,7 @@ index 328ff012b..1594d7ca4 100644
static void readConfig(Class<?> clazz, Object instance) {
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
index d386a876b..ba51303b2 100644
index 80068e285..c779e035c 100644
--- a/src/main/java/org/spigotmc/SpigotConfig.java
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
@@ -0,0 +0,0 @@ public class SpigotConfig