aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0467-Add-entity-liquid-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0467-Add-entity-liquid-API.patch')
-rw-r--r--patches/server/0467-Add-entity-liquid-API.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/patches/server/0467-Add-entity-liquid-API.patch b/patches/server/0467-Add-entity-liquid-API.patch
new file mode 100644
index 0000000000..0507e83a33
--- /dev/null
+++ b/patches/server/0467-Add-entity-liquid-API.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: William Blake Galbreath <[email protected]>
+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 59175679a2fae171b3d01fed5db8ac57d0a63a29..5a23c9fe4147c82ce2e6eda9690b158b030f71f6 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -1353,7 +1353,6 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i
+ 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 fd811e2ba455d7e4eb618d48ca2c4983797a265c..38e38abd5302a9f8c5eb2d3d81d825cdae99d7c4 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1235,5 +1235,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
+ }