mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-01 20:50:41 +01:00
ef0e5a642d
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 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
|
|
|
|
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 e598c7c90d625313b8a935418bb68e0e6cb6bc6e..c6f14159067a14afd44378aaa9ac840aba2e2f9c 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -3,6 +3,7 @@ package org.bukkit.entity;
|
|
import java.util.List;
|
|
import java.util.Set;
|
|
import java.util.UUID;
|
|
+import org.bukkit.Chunk; // Paper
|
|
import org.bukkit.EntityEffect;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Nameable;
|
|
@@ -715,5 +716,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
* @return True if entity spawned from a mob spawner
|
|
*/
|
|
boolean fromMobSpawner();
|
|
+
|
|
+ /**
|
|
+ * Gets the latest chunk an entity is currently or was in.
|
|
+ *
|
|
+ * @return The current, or most recent chunk if the entity is invalid (which may load the chunk)
|
|
+ */
|
|
+ @NotNull
|
|
+ default Chunk getChunk() {
|
|
+ // TODO remove impl here
|
|
+ return getLocation().getChunk();
|
|
+ }
|
|
// Paper end
|
|
}
|