mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
b5ce6e3dc5
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: eb4b416d PR-822: Add experimental armor trim API 33498e1d PR-831: Add a standard of annotations for Minecraft experimental things and API CraftBukkit Changes: 19de3550d SPIGOT-7315: Bed placement duplicates crops if cancelled 1eb88374e PR-1147: Add experimental armor trim API c4c0bb0e9 Show clean error for invalidly configured server.properties options 3ae90697f Fix UUID not being updated when changing world of MapView e43000601 PR-1164, MC-227255, MC-253819: Fix rotation of beehives and bells Spigot Changes: d2fdfe39 Rebuild patches
52 lines
1.4 KiB
Diff
52 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 9d3c3dedb4f71b9fc35cb5da6e38c77c7c673ad6..e2caf7d0f8c0754617a2d7dfa065fd46e74d3f52 100644
|
|
--- a/src/main/java/org/bukkit/entity/Entity.java
|
|
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
|
@@ -787,5 +787,40 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
|
*/
|
|
@NotNull
|
|
org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is underwater
|
|
+ */
|
|
+ boolean isUnderWater();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in rain
|
|
+ */
|
|
+ boolean isInRain();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in bubble column
|
|
+ */
|
|
+ boolean isInBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or rain
|
|
+ */
|
|
+ boolean isInWaterOrRain();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or bubble column
|
|
+ */
|
|
+ boolean isInWaterOrBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in water or rain or bubble column
|
|
+ */
|
|
+ boolean isInWaterOrRainOrBubbleColumn();
|
|
+
|
|
+ /**
|
|
+ * Check if entity is in lava
|
|
+ */
|
|
+ boolean isInLava();
|
|
// Paper end
|
|
}
|