2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Byteflux <byte@byteflux.net>
|
|
|
|
Date: Tue, 1 Mar 2016 14:14:15 -0600
|
|
|
|
Subject: [PATCH] Drop falling block and tnt entities at the specified height
|
|
|
|
|
2022-10-09 08:52:09 +02:00
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
2024-01-24 11:45:17 +01:00
|
|
|
index d344b13e3726f0fe8a57c098769d1beea9705cdd..67088152004caeecf4a678618be19419862e7ff1 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
2023-07-04 10:22:56 +02:00
|
|
|
@@ -142,6 +142,16 @@ public class FallingBlockEntity extends Entity {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper start - Configurable falling blocks height nerf
|
2023-06-08 00:28:06 +02:00
|
|
|
+ if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
|
|
|
|
+ if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ this.spawnAtLocation(block);
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper end - Configurable falling blocks height nerf
|
2023-06-07 20:31:32 +02:00
|
|
|
if (!this.level().isClientSide) {
|
2022-03-01 06:43:03 +01:00
|
|
|
BlockPos blockposition = this.blockPosition();
|
2021-06-11 14:02:28 +02:00
|
|
|
boolean flag = this.blockState.getBlock() instanceof ConcretePowderBlock;
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
2024-01-24 11:45:17 +01:00
|
|
|
index 36d93ee421406302c05945db17d46b04b485e4c0..19e2f2005bd1fb4d199debd34e92a0794a3d3fe4 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
|
2023-12-05 20:39:26 +01:00
|
|
|
@@ -77,6 +77,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper start - Configurable TNT height nerf
|
2023-06-07 23:35:19 +02:00
|
|
|
+ if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper end - Configurable TNT height nerf
|
2021-06-11 14:02:28 +02:00
|
|
|
this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
|
2023-06-07 20:31:32 +02:00
|
|
|
if (this.onGround()) {
|
2021-06-11 14:02:28 +02:00
|
|
|
this.setDeltaMovement(this.getDeltaMovement().multiply(0.7D, -0.5D, 0.7D));
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
|
2024-01-24 11:45:17 +01:00
|
|
|
index 0fc58f38bbd855414ad36b682e60b069d7b68cb1..48f531da21fa0305ab1e8d5b50276e61e3155a38 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
|
2023-03-14 19:05:23 +01:00
|
|
|
@@ -53,6 +53,12 @@ public class MinecartTNT extends AbstractMinecart {
|
2021-06-11 14:02:28 +02:00
|
|
|
public void tick() {
|
|
|
|
super.tick();
|
|
|
|
if (this.fuse > 0) {
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper start - Configurable TNT height nerf
|
2023-06-07 23:35:19 +02:00
|
|
|
+ if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
2024-01-24 11:45:17 +01:00
|
|
|
+ // Paper end - Configurable TNT height nerf
|
2021-06-11 14:02:28 +02:00
|
|
|
--this.fuse;
|
2023-06-07 20:31:32 +02:00
|
|
|
this.level().addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
|
2021-06-11 14:02:28 +02:00
|
|
|
} else if (this.fuse == 0) {
|