mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-29 19:52:55 +01:00
899bc53b79
Upstream has released updates that appears 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: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change
51 lines
1.4 KiB
Diff
51 lines
1.4 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 0053b1d4f6ebf21d108dd40b9ce2a9e081ecea98..d9ffa92f817f3b850cd7272450d2432b47f1fecf 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -655,5 +655,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
*/
|
|
@NotNull
|
|
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water
|
|
+ */
|
|
+ public boolean isInWater();
|
|
+
|
|
+ /**
|
|
+ * 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
|
|
}
|