diff options
| author | Jake Potrebic <[email protected]> | 2024-05-29 13:58:57 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-05-29 22:58:57 +0200 |
| commit | a31dc90741ed9c121a13a3c124c9ebf5bafd0da7 (patch) | |
| tree | 81963bd94fe7772ee08bd21710230de21b6b25da /patches/server/0388-Add-entity-liquid-API.patch | |
| parent | ed85aac53cfd93d29fa24e6071dbdddd0e49624b (diff) | |
| download | Paper-a31dc90741ed9c121a13a3c124c9ebf5bafd0da7.tar.gz Paper-a31dc90741ed9c121a13a3c124c9ebf5bafd0da7.zip | |
Several fixes and new api for experience merging/stacking (#9242)
Diffstat (limited to 'patches/server/0388-Add-entity-liquid-API.patch')
| -rw-r--r-- | patches/server/0388-Add-entity-liquid-API.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/patches/server/0388-Add-entity-liquid-API.patch b/patches/server/0388-Add-entity-liquid-API.patch new file mode 100644 index 0000000000..ab34d7ab7a --- /dev/null +++ b/patches/server/0388-Add-entity-liquid-API.patch @@ -0,0 +1,55 @@ +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 + +== AT == +public net.minecraft.world.entity.Entity isInRain()Z +public net.minecraft.world.entity.Entity isInBubbleColumn()Z + +diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +index 571b8352de4070622cdc47a50643beada0b16c36..40e4b8233e27b8ebd94a89bb43b5c14808edaa68 100644 +--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java ++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +@@ -1008,4 +1008,41 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { + return getHandle().spawnReason; + } + // Paper end - entity spawn reason API ++ ++ // Paper start - entity liquid API ++ @Override ++ public boolean isUnderWater() { ++ return getHandle().isUnderWater(); ++ } ++ ++ @Override ++ public boolean isInRain() { ++ return getHandle().isInRain(); ++ } ++ ++ @Override ++ public boolean isInBubbleColumn() { ++ return getHandle().isInBubbleColumn(); ++ } ++ ++ @Override ++ public boolean isInWaterOrRain() { ++ return getHandle().isInWaterOrRain(); ++ } ++ ++ @Override ++ public boolean isInWaterOrBubbleColumn() { ++ return getHandle().isInWaterOrBubble(); ++ } ++ ++ @Override ++ public boolean isInWaterOrRainOrBubbleColumn() { ++ return getHandle().isInWaterRainOrBubble(); ++ } ++ ++ @Override ++ public boolean isInLava() { ++ return getHandle().isInLava(); ++ } ++ // Paper end - entity liquid API + } |