2021-06-11 12:02:28 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
|
|
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
|
2021-11-24 22:26:32 +00:00
|
|
|
index 7b6f23136330e14e977dd4fe24b18339ca25be6e..b61f728c83e006197fdb158e83d04b5498133cc3 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-11-24 22:26:32 +00:00
|
|
|
@@ -1314,7 +1314,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
2021-06-14 14:41:34 +00:00
|
|
|
return this.isInWater() || this.isInRain();
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
|
2021-06-17 19:52:26 +00:00
|
|
|
- @Deprecated public final boolean isInWaterOrRainOrBubble() { return isInWaterRainOrBubble(); } // Paper - OBFHELPER
|
2021-06-14 14:41:34 +00:00
|
|
|
public boolean isInWaterRainOrBubble() {
|
|
|
|
return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
|
2021-06-11 12:02:28 +00:00
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2021-11-24 15:07:19 +00:00
|
|
|
index fd811e2ba455d7e4eb618d48ca2c4983797a265c..38e38abd5302a9f8c5eb2d3d81d825cdae99d7c4 100644
|
2021-06-11 12:02:28 +00:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2021-09-23 21:07:44 +00:00
|
|
|
@@ -1235,5 +1235,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2021-06-11 12:02:28 +00:00
|
|
|
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() {
|
2021-06-14 14:41:34 +00:00
|
|
|
+ return getHandle().isInWaterOrBubble();
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean isInWaterOrRainOrBubbleColumn() {
|
2021-06-14 14:41:34 +00:00
|
|
|
+ return getHandle().isInWaterRainOrBubble();
|
2021-06-11 12:02:28 +00:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean isInLava() {
|
|
|
|
+ return getHandle().isInLava();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|