Update upstream

This commit is contained in:
Aikar
2018-07-25 19:05:07 -04:00
parent 10ed7dc6b4
commit 8536a71daa
49 changed files with 148 additions and 148 deletions

View File

@@ -3004,7 +3004,7 @@ index 00000000..df592d85
+ }
+}
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 0f42a66a..68b5e1c9 100644
index ff7f436c..b56c09d3 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -0,0 +0,0 @@ public final class Bukkit {
@@ -3016,7 +3016,7 @@ index 0f42a66a..68b5e1c9 100644
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 053a24dc..0d41f7db 100644
index a766ee96..4ddb8b02 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {