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
|
|
|
|
|
|
|
|
* Dec 2, 2020 Added tnt nerf for tnt minecarts - Machine_Maker
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
2022-06-09 10:51:45 +02:00
|
|
|
index 7e1594e8df4fd09cd1aecbc5f3784797b04a8337..bd357c3e6fcbd82f3c53ecc8dab46aa5d3708bc2 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
|
2022-04-30 18:27:41 +02:00
|
|
|
@@ -137,6 +137,17 @@ public class FallingBlockEntity extends Entity {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
|
|
|
+
|
|
|
|
+ // Paper start - Configurable EntityFallingBlock height nerf
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (this.level.paperConfig().fixes.fallingBlockHeightNerf != 0 && this.getY() > this.level.paperConfig().fixes.fallingBlockHeightNerf) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ if (this.dropItem && this.level.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
|
|
|
|
+ this.spawnAtLocation(block);
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
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
|
2022-06-09 10:51:45 +02:00
|
|
|
index e24b46820394c5f220d5bf7c4e763ef95ff9e9ab..2d4a990da2402a6c24c03e8be7e518e33db99c8f 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
|
2021-06-12 00:37:16 +02:00
|
|
|
@@ -68,6 +68,12 @@ public class PrimedTnt extends Entity {
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.move(MoverType.SELF, this.getDeltaMovement());
|
|
|
|
+ // Paper start - Configurable TNT entity height nerf
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (this.level.paperConfig().fixes.tntEntityHeightNerf != 0 && this.getY() > this.level.paperConfig().fixes.tntEntityHeightNerf) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
this.setDeltaMovement(this.getDeltaMovement().scale(0.98D));
|
|
|
|
if (this.onGround) {
|
|
|
|
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
|
2022-06-09 10:51:45 +02:00
|
|
|
index c10c28eb441e65c6285c25b5d4760c876909c724..136bd0168b573079dfad127d02ca8ba72c02fafb 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
|
2022-06-07 21:15:06 +02:00
|
|
|
@@ -46,6 +46,12 @@ public class MinecartTNT extends AbstractMinecart {
|
2021-06-11 14:02:28 +02:00
|
|
|
public void tick() {
|
|
|
|
super.tick();
|
|
|
|
if (this.fuse > 0) {
|
|
|
|
+ // Paper start - Configurable TNT entity height nerf
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (this.level.paperConfig().fixes.tntEntityHeightNerf != 0 && this.getY() > this.level.paperConfig().fixes.tntEntityHeightNerf) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ this.discard();
|
2021-06-11 14:02:28 +02:00
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
--this.fuse;
|
|
|
|
this.level.addParticle(ParticleTypes.SMOKE, this.getX(), this.getY() + 0.5D, this.getZ(), 0.0D, 0.0D, 0.0D);
|
|
|
|
} else if (this.fuse == 0) {
|