Update upstream B/CB/S

This commit is contained in:
Zach Brown
2018-10-27 00:02:22 -04:00
parent 090b025ed3
commit f29440f891
57 changed files with 221 additions and 227 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Add sun related API
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index aa28c452..27e58136 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -26,7 +26,7 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
* Returns whether the world has an ongoing storm.
*
diff --git a/src/main/java/org/bukkit/entity/Mob.java b/src/main/java/org/bukkit/entity/Mob.java
index 7ac07ac07ac0..7ac07ac07ac0 100644
index 48eddcd3..1b108a4a 100644
--- a/src/main/java/org/bukkit/entity/Mob.java
+++ b/src/main/java/org/bukkit/entity/Mob.java
@@ -0,0 +0,0 @@ public interface Mob extends LivingEntity, Lootable {