Update upstream B/CB/S

This commit is contained in:
Zach Brown
2017-05-04 18:08:52 -05:00
parent d3f692b39b
commit 26d7646a75
23 changed files with 25 additions and 92 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable flying kick messages
diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
index bb4114b8d..f86729724 100644
index d765607c0..5b4d715a4 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 {