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 28f9b58c379306138f1528d91f2112c21ae9cb0a..0f37c205fe401126a19191fb5382cc1b4d3f43b4 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -1305,13 +1305,13 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return this.wasTouchingWater; } - private boolean isInRain() { + public boolean isInRain() { // Paper - private -> public BlockPos blockposition = this.blockPosition(); return this.level.isRainingAt(blockposition) || this.level.isRainingAt(new BlockPos((double) blockposition.getX(), this.getBoundingBox().maxY, (double) blockposition.getZ())); } - private boolean isInBubbleColumn() { + public boolean isInBubbleColumn() { // Paper - make public return this.level.getBlockState(this.blockPosition()).is(Blocks.BUBBLE_COLUMN); } @@ -1319,7 +1319,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n return this.isInWater() || this.isInRain(); } - 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 98d3818d38f487fc7e1302ee4af9e4898efec809..a13042367ac284ce23d799eba1330aa2777173e7 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1169,5 +1169,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 }