Archiviert
13
0
Dieses Repository wurde am 2024-12-25 archiviert. Du kannst Dateien ansehen und es klonen, aber nicht pushen oder Issues/Pull-Requests öffnen.
Paper-Old/patches/server/0026-Drop-falling-block-and-tnt-entities-at-the-specified.patch

63 Zeilen
3.4 KiB
Diff

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
2023-06-08 00:28:06 +02:00
index da6e806288cf3afc2c72228844d1d05eee8324a5..93e5e8294b6571a355432e728f7dd49ddcf70d3e 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-06-07 20:31:32 +02:00
@@ -140,6 +140,16 @@ 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
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;
+ }
+ // Paper end
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
2023-06-07 23:35:19 +02:00
index 320966e6e55dad3a96fee25fe0f69135d86ee8bc..221ce518464332a27c43850c8bc25cd2fe0a9921 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-03-14 19:05:23 +01:00
@@ -66,6 +66,12 @@ public class PrimedTnt extends Entity implements TraceableEntity {
2021-06-11 14:02:28 +02:00
}
this.move(MoverType.SELF, this.getDeltaMovement());
+ // Paper start - Configurable TNT entity 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;
+ }
+ // Paper end
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
2023-06-07 23:35:19 +02:00
index 137f9052701c5b10ff03b01316ced37220dbf280..1f4031cb7a101a7f25d530380974a627cc29bb09 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) {
+ // Paper start - Configurable TNT entity 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;
+ }
+ // Paper end
--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) {