From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Samsuik <40902469+Samsuik@users.noreply.github.com> Date: Fri, 13 Oct 2023 20:02:04 +0100 Subject: [PATCH] isPushedByFluid API diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index ffa4bb17c002a953df4142e353ba9a05b362e3e6..a7984107161d74aed3f064df1e2576c39a88c506 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -673,6 +673,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { discard(); } // Sakura end + public boolean pushedByFluid = true; // Sakura public boolean isLegacyTrackingEntity = false; @@ -4178,7 +4179,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { } public boolean isPushedByFluid() { - return true; + return pushedByFluid; // Sakura } public static double getViewScale() { diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 9f843b89dc20b91bf7243facee8486d525e4a1b3..0ca488d26b137d553a0b8c96629c1080a1303ca5 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -548,6 +548,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.entity.isInWater(); } + // Sakura start + @Override + public boolean isPushedByFluid() { + return getHandle().isPushedByFluid(); + } + + @Override + public void setPushedByFluid(boolean push) { + getHandle().pushedByFluid = push; + } + // Sakura end + @Override public World getWorld() { return this.entity.level().getWorld();