PaperMC/patches/server/0032-Drop-falling-block-and-tnt-entities-at-the-specified.patch

63 lines
3.6 KiB
Diff
Raw Normal View History

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
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-10-25 13:34:01 +02:00
index e9e8ad33371749f52a88a0ee089540eb26fb0f28..a5543a6b4811628ff5178a0ec01933ec4b30dfa4 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
2024-10-22 20:04:31 +02:00
@@ -159,6 +159,16 @@ public class FallingBlockEntity extends Entity {
this.applyGravity();
2021-06-11 14:02:28 +02:00
this.move(MoverType.SELF, this.getDeltaMovement());
2024-10-22 20:04:31 +02:00
this.applyEffectsFromBlocks();
+ // 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)) {
2024-10-25 13:34:01 +02:00
+ if (this.dropItem && this.level() instanceof final ServerLevel serverLevel && serverLevel.getGameRules().getBoolean(GameRules.RULE_DOENTITYDROPS)) {
+ this.spawnAtLocation(serverLevel, block);
2021-06-11 14:02:28 +02:00
+ }
+
+ this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // Paper end - Configurable falling blocks height nerf
2024-06-13 19:12:48 +02:00
this.handlePortal();
2024-10-22 20:04:31 +02:00
Level world = this.level();
2021-06-11 14:02:28 +02:00
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-10-22 20:04:31 +02:00
index 91381122b5b63139be880f80dadde4d8cf31a260..3d489fdc14b3e29bab63f330d5edbbc1d354382a 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
2024-10-22 20:04:31 +02:00
@@ -106,6 +106,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
this.applyGravity();
2021-06-11 14:02:28 +02:00
this.move(MoverType.SELF, this.getDeltaMovement());
2024-10-22 20:04:31 +02:00
this.applyEffectsFromBlocks();
+ // 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)) {
+ this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // 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-10-22 20:04:31 +02:00
index ef87b0b4dbf4f08b7ec00eed0eb4df2e3f13d4a7..0652494dc5f3d999116d4380032dea0e7402caec 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
2024-10-22 20:04:31 +02:00
@@ -52,6 +52,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 height nerf
2023-06-07 23:35:19 +02:00
+ if (this.level().paperConfig().fixes.tntEntityHeightNerf.test(v -> this.getY() > v)) {
+ this.discard(EntityRemoveEvent.Cause.OUT_OF_WORLD);
2021-06-11 14:02:28 +02:00
+ return;
+ }
+ // 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) {