9
0
mirror of https://github.com/Samsuik/Sakura.git synced 2026-01-04 15:31:43 +00:00

Keep the bukkitEntity around after changing the handle

This commit is contained in:
Samsuik
2025-02-13 21:17:17 +00:00
parent fe0b6706bd
commit 2154e771ff
8 changed files with 42 additions and 41 deletions

View File

@@ -5,18 +5,18 @@ 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 ed49b640fef4e391c071453124c8ebd69d7f4197..fd10bf88ed6c75a4617d568b9310e1ee61de46c4 100644
index 4836a193c563abe01d6a05a699becb2f0c353d43..94c8794c9c174e1f511d50f1ebac97ddbb98a80b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -720,6 +720,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
this.bukkitEntity = entity.getBukkitEntity();
@@ -721,6 +721,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
}
// Sakura end - cannon entity merging
+ public boolean pushedByFluid = true; // Sakura - entity pushed by fluid api
public Entity(EntityType<?> type, Level world) {
this.id = Entity.ENTITY_COUNTER.incrementAndGet();
@@ -4258,7 +4259,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
@@ -4259,7 +4260,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S
}
public boolean isPushedByFluid() {