2021-06-11 14:02:28 +02: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-12-22 19:02:31 +01:00
|
|
|
index 59175679a2fae171b3d01fed5db8ac57d0a63a29..5a23c9fe4147c82ce2e6eda9690b158b030f71f6 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2021-12-03 22:28:15 +01:00
|
|
|
@@ -1353,7 +1353,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
|
2021-06-14 16:41:34 +02:00
|
|
|
return this.isInWater() || this.isInRain();
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2021-06-17 21:52:26 +02:00
|
|
|
- @Deprecated public final boolean isInWaterOrRainOrBubble() { return isInWaterRainOrBubble(); } // Paper - OBFHELPER
|
2021-06-14 16:41:34 +02:00
|
|
|
public boolean isInWaterRainOrBubble() {
|
|
|
|
return this.isInWater() || this.isInRain() || this.isInBubbleColumn();
|
2021-06-11 14:02:28 +02: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 16:07:19 +01:00
|
|
|
index fd811e2ba455d7e4eb618d48ca2c4983797a265c..38e38abd5302a9f8c5eb2d3d81d825cdae99d7c4 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
|
2021-09-23 23:07:44 +02:00
|
|
|
@@ -1235,5 +1235,29 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
|
2021-06-11 14:02:28 +02: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 16:41:34 +02:00
|
|
|
+ return getHandle().isInWaterOrBubble();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean isInWaterOrRainOrBubbleColumn() {
|
2021-06-14 16:41:34 +02:00
|
|
|
+ return getHandle().isInWaterRainOrBubble();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public boolean isInLava() {
|
|
|
|
+ return getHandle().isInLava();
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
}
|