69 lines
3 KiB
Diff
69 lines
3 KiB
Diff
|
From e29729e0e0500cc46e355b654b01114a03605c96 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
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 41747bd..0d0cca5 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -125,4 +125,14 @@ public class PaperWorldConfig {
|
||
|
|
keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
|
||
|
|
log("Keep spawn chunk loaded: " + keepSpawnInMemory);
|
||
|
|
}
|
||
|
|
+
|
||
|
|
+ public int fallingBlockHeightNerf;
|
||
|
|
+ public int entityTNTHeightNerf;
|
||
|
|
+ private void heightNerfs() {
|
||
|
|
+ fallingBlockHeightNerf = getInt("falling-block-height-nerf", 0);
|
||
|
|
+ entityTNTHeightNerf = getInt("tnt-entity-height-nerf", 0);
|
||
|
|
+
|
||
|
|
+ if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
|
||
|
|
+ if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||
|
|
index 86cb592..9c506ed 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
||
|
|
@@ -76,6 +76,17 @@ public class EntityFallingBlock extends Entity {
|
||
|
|
|
||
|
|
this.motY -= 0.03999999910593033D;
|
||
|
|
this.move(this.motX, this.motY, this.motZ);
|
||
|
|
+
|
||
|
|
+ // Paper start - Configurable EntityFallingBlock height nerf
|
||
|
|
+ if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
|
||
|
|
+ if (this.dropItem) {
|
||
|
|
+ this.a(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ this.die();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
this.motX *= 0.9800000190734863D;
|
||
|
|
this.motY *= 0.9800000190734863D;
|
||
|
|
this.motZ *= 0.9800000190734863D;
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
index 35ed2a6..564ea37 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
||
|
|
@@ -51,6 +51,13 @@ public class EntityTNTPrimed extends Entity {
|
||
|
|
this.lastZ = this.locZ;
|
||
|
|
this.motY -= 0.03999999910593033D;
|
||
|
|
this.move(this.motX, this.motY, this.motZ);
|
||
|
|
+
|
||
|
|
+ // Paper start - Configurable TNT entity height nerf
|
||
|
|
+ if (this.world.paperConfig.entityTNTHeightNerf != 0 && this.locY > this.world.paperConfig.entityTNTHeightNerf) {
|
||
|
|
+ this.die();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
+
|
||
|
|
this.motX *= 0.9800000190734863D;
|
||
|
|
this.motY *= 0.9800000190734863D;
|
||
|
|
this.motZ *= 0.9800000190734863D;
|
||
|
|
--
|
||
|
|
2.7.2
|
||
|
|
|