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
42 changed files with 158 additions and 229 deletions

View File

@@ -1,4 +1,4 @@
From 3d06d7bea98b884dbda0cf95be3494af6c509546 Mon Sep 17 00:00:00 2001
From 5b4f6eb2598e8b89c0c3ba00b1f8f7af18ed9a36 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 Jul 2018 02:25:48 -0400
Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
Get the chunk the entity is currently registered to
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 3ae4de7a..e2a2b78c 100644
index 4548c95b..573a6918 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1,5 +1,6 @@
@@ -16,7 +16,7 @@ index 3ae4de7a..e2a2b78c 100644
import org.bukkit.Location;
import org.bukkit.EntityEffect;
import org.bukkit.Nameable;
@@ -514,5 +515,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
@@ -544,5 +545,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
* @return True if entity spawned from a mob spawner
*/
boolean fromMobSpawner();