From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 2 Jul 2020 18:11:43 -0500 Subject: [PATCH] Add entity liquid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index dbaa2d9a067bf03f177ac57ee1f0eb156c779314..73fc8ebd2ec207db2efc545f6bb304d53880b78f 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1342,7 +1342,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return this.isInWater() || this.isInRain(); } - @Deprecated public final boolean isInWaterOrRainOrBubble() { return isInWaterRainOrBubble(); } // Paper - OBFHELPER public boolean isInWaterRainOrBubble() { return this.isInWater() || this.isInRain() || this.isInBubbleColumn(); } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index c2e9f30379cd7458dc18585053faac8c593bbfa2..17ad49994499982a08c1e8a4b4635647d669986a 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1201,5 +1201,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { public org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason getEntitySpawnReason() { return getHandle().spawnReason; } + + public boolean isInRain() { + return getHandle().isInRain(); + } + + public boolean isInBubbleColumn() { + return getHandle().isInBubbleColumn(); + } + + public boolean isInWaterOrRain() { + return getHandle().isInWaterOrRain(); + } + + public boolean isInWaterOrBubbleColumn() { + return getHandle().isInWaterOrBubble(); + } + + public boolean isInWaterOrRainOrBubbleColumn() { + return getHandle().isInWaterRainOrBubble(); + } + + public boolean isInLava() { + return getHandle().isInLava(); + } // Paper end }