Update upstream B/CB/S
This commit is contained in:
parent
b1ab9ad452
commit
c4865a6445
57 changed files with 380 additions and 386 deletions
|
@ -1,14 +1,14 @@
|
|||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
|
||||
From 09dee3bad3aecdc375e9059a0679536b3dc2a23b Mon Sep 17 00:00:00 2001
|
||||
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
||||
Date: Sun, 7 Oct 2018 00:54:15 -0500
|
||||
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
|
||||
@@ -1207,6 +1207,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -1423,6 +1423,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
*/
|
||||
public void setFullTime(long time);
|
||||
|
||||
|
@ -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
|
||||
@@ -13,6 +13,13 @@ public interface Mob extends LivingEntity, Lootable {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue