aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch')
-rw-r--r--patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch62
1 files changed, 62 insertions, 0 deletions
diff --git a/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
new file mode 100644
index 0000000000..2796f982aa
--- /dev/null
+++ b/patches/unapplied/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -0,0 +1,62 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Byteflux <[email protected]>
+Date: Tue, 1 Mar 2016 14:14:15 -0600
+Subject: [PATCH] Drop falling block and tnt entities at the specified height
+
+Co-authored-by: Jake Potrebic <[email protected]>
+
+diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+index 15d7cb338a0a1c77e999c23042f04ef3f24ede9a..5e30e7a1447503f424ec3a5aa3983826ee960fd8 100644
+--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
+@@ -142,6 +142,16 @@ public class FallingBlockEntity extends Entity {
+ }
+
+ this.move(MoverType.SELF, this.getDeltaMovement());
++ // Paper start - Configurable EntityFallingBlock height nerf
++ if (this.level().paperConfig().fixes.fallingBlockHeightNerf.test(v -> this.getY() > v)) {
++ if (this.dropItem && this.level().getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
++ this.spawnAtLocation(block);
++ }
++
++ this.discard();
++ return;
++ }
++ // Paper end
+ if (!this.level().isClientSide) {
+ BlockPos blockposition = this.blockPosition();
+ 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
+index a290daaeebfc110428dd8201f144c2acb06fddfc..415b8822f0dfb14d49bccb2a10ac04025891ddf7 100644
+--- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
++++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
+@@ -69,6 +69,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
+ }
+
+ this.move(MoverType.SELF, this.getDeltaMovement());
++ // Paper start - Configurable TNT entity height nerf
++ if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
++ this.discard();
++ 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
+index 137f9052701c5b10ff03b01316ced37220dbf280..1f4031cb7a101a7f25d530380974a627cc29bb09 100644
+--- a/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
++++ b/src/main/java/net/minecraft/world/entity/vehicle/MinecartTNT.java
+@@ -53,6 +53,12 @@ public class MinecartTNT extends AbstractMinecart {
+ public void tick() {
+ super.tick();
+ if (this.fuse > 0) {
++ // Paper start - Configurable TNT entity height nerf
++ if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
++ this.discard();
++ 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) {