mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-03 22:16:38 +00:00
44 lines
2.0 KiB
Diff
44 lines
2.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samsuik <40902469+Samsuik@users.noreply.github.com>
|
|
Date: Mon, 16 Oct 2023 22:57:55 +0100
|
|
Subject: [PATCH] Optimise TNT fluid state and pushing
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index 8f58e0989b536e670766d82a873d1fb0581a3492..b9d91310268088b43c432e7fb4d669cc9ddae527 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -2257,7 +2257,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
|
|
return this.isInWater() || flag;
|
|
}
|
|
|
|
- void updateInWaterStateAndDoWaterCurrentPushing() {
|
|
+ protected void updateInWaterStateAndDoWaterCurrentPushing() { // Sakura
|
|
Entity entity = this.getVehicle();
|
|
|
|
if (entity instanceof Boat entityboat) {
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
index 469bc508416ae44546c655a23d9bc2572078ccb5..bfe1b2debf94c54f923daf81ad51a7e9ca92d3d1 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
@@ -92,6 +92,19 @@ public class PrimedTnt extends Entity implements TraceableEntity {
|
|
}
|
|
// Sakura - specialised explosions
|
|
// Sakura end
|
|
+ // Sakura start
|
|
+ protected boolean updateInWaterStateAndDoFluidPushing() {
|
|
+ if (this.isPushedByFluid()) {
|
|
+ return super.updateInWaterStateAndDoFluidPushing();
|
|
+ } else {
|
|
+ // super method also handles lava fluid pushing
|
|
+ // we only need to search for water to negate fall distance
|
|
+ this.fluidHeight.clear();
|
|
+ this.updateInWaterStateAndDoWaterCurrentPushing();
|
|
+ return this.isInWater();
|
|
+ }
|
|
+ }
|
|
+ // Sakura end
|
|
|
|
@Override
|
|
protected double getDefaultGravity() {
|