Update Upstream

Removed my ChunkLoadEvent patch as upstream fixed it
This commit is contained in:
Aikar 2018-07-30 01:08:59 -04:00
parent 75d71a2f14
commit 76e1e4d79f
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
42 changed files with 158 additions and 229 deletions

View file

@ -1,14 +1,14 @@
From d12b4647862ab81272f1030da1a9fbeb2e7d30b1 Mon Sep 17 00:00:00 2001
From bd7616fdffd024a27253dc7613e74e7fb600659b Mon Sep 17 00:00:00 2001
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Sun, 18 Jun 2017 18:17:05 -0500
Subject: [PATCH] Entity#fromMobSpawner()
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 9b0f97f1..3ae4de7a 100644
index f91b3fd3..4548c95b 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -507,5 +507,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -537,5 +537,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return Location where entity originates or null if not yet added
*/
Location getOrigin();