mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-26 06:44:49 +02: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
47 lines
1.3 KiB
Diff
47 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 2 Jul 2020 18:11:33 -0500
|
|
Subject: [PATCH] Add entity liquid API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
|
index f17f30a9969e52313387c0d92edd980f72687a11..587bf31ed2b2edc7d467d226c91c2bccdd1e4044 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -760,5 +760,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
*/
|
|
@NotNull
|
|
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in rain
|
|
+ */
|
|
+ public boolean isInRain();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in bubble column
|
|
+ */
|
|
+ public boolean isInBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or rain
|
|
+ */
|
|
+ public boolean isInWaterOrRain();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or bubble column
|
|
+ */
|
|
+ public boolean isInWaterOrBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or rain or bubble column
|
|
+ */
|
|
+ public boolean isInWaterOrRainOrBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in lava
|
|
+ */
|
|
+ public boolean isInLava();
|
|
// Paper end
|
|
}
|