aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0461-Add-entity-liquid-API.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0461-Add-entity-liquid-API.patch')
-rw-r--r--patches/server/0461-Add-entity-liquid-API.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/patches/server/0461-Add-entity-liquid-API.patch b/patches/server/0461-Add-entity-liquid-API.patch
new file mode 100644
index 0000000000..4482f88f22
--- /dev/null
+++ b/patches/server/0461-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 e2585356cb8e9d556901a87df4a0b33bf4a5dcf4..eac485db587eba68ab0d05ac5bfd07fb20c0e766 100644
+--- a/src/main/java/net/minecraft/world/entity/Entity.java
++++ b/src/main/java/net/minecraft/world/entity/Entity.java
+@@ -1372,7 +1372,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 b732d9de71e5799969852a22f22e860637f7d64e..1f2503748e0534d48db558d09997683d563b649c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+@@ -1243,5 +1243,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
+ }