Update upstream B/CB/S
This commit is contained in:
parent
b1ab9ad452
commit
c4865a6445
57 changed files with 380 additions and 386 deletions
|
@ -1,4 +1,4 @@
|
|||
From 2cb5b1bda018ce49ec34c527b63a8848990a01ea Mon Sep 17 00:00:00 2001
|
||||
From aa7fb497e60582cd247d5e3a6b36816f1b2e4a87 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 6bdbd7ab..66904a0c 100644
|
||||
index 08399637..f94160bf 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 6bdbd7ab..66904a0c 100644
|
|||
import org.bukkit.Location;
|
||||
import org.bukkit.EntityEffect;
|
||||
import org.bukkit.Nameable;
|
||||
@@ -563,5 +564,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
|
||||
@@ -574,5 +575,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
|
||||
* @return True if entity spawned from a mob spawner
|
||||
*/
|
||||
boolean fromMobSpawner();
|
||||
|
@ -30,5 +30,5 @@ index 6bdbd7ab..66904a0c 100644
|
|||
// Paper end
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue