mirror of
https://github.com/Samsuik/Sakura.git
synced 2025-12-23 16:59:16 +00:00
b00025824d
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@52a0590 Updated Upstream (Bukkit/CraftBukkit) (#11543) PaperMC/Paper@5c0930d Fix fix recipe iterator patch PaperMC/Paper@1de0130 re-add a dispense fix patch PaperMC/Paper@16d7d73 bunch more general fixes PaperMC/Paper@a5d7426 Correctly support RecipeChoice.empty (#11550) PaperMC/Paper@85c870e Correct update cursor (#11554) PaperMC/Paper@d19be64 Fix NPE with spark when CraftServer is not init yet (#11558) PaperMC/Paper@92131ad Decrease dead entity teleport warning (#11559) PaperMC/Paper@a6df4c8 Handle corrupt light data gracefully PaperMC/Paper@ce0a041 [ci skip] Rebuild patches PaperMC/Paper@c6aa61e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11561) PaperMC/Paper@93b435d [ci skip] better instructions for patch apply conflict (#11568) PaperMC/Paper@42a1901 Correctly adopt upstream item EAR fix (#11582) PaperMC/Paper@fcb6c72 Correctly pass velocity native compressor (#11509) PaperMC/Paper@99f4bb2 Fix infinite fireworks (#11592) (#11594)
46 lines
2.1 KiB
Diff
46 lines
2.1 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
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
index de6a81d222cd5fef81be87c188b5a726710202f7..b6fe11f2e0cd92bc903445edd7f997baec4c3e75 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
@@ -2269,7 +2269,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 AbstractBoat abstractboat) {
|
|
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 93cf290b25d569820dd1bf9b4b5fb255abdbd8cd..f2206e57c04d29ed470ae2083b25ab502144ccb1 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
@@ -126,6 +126,21 @@ public class PrimedTnt extends Entity implements TraceableEntity, me.samsuik.sak
|
|
return !this.isRemoved();
|
|
}
|
|
|
|
+ // Sakura start - optimise tnt fluid state
|
|
+ @Override
|
|
+ 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 - optimise tnt fluid state
|
|
+
|
|
@Override
|
|
protected double getDefaultGravity() {
|
|
return 0.04D;
|