testserver/Spigot-Server-Patches/0013-Drop-falling-block-and...

68 lines
3.0 KiB
Diff
Raw Normal View History

From 0eada54aa2eee86bf693c1ac9f60195a38eb41ff Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00:00
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 7ac6a5f1f..8cdeb34d4 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -121,4 +121,14 @@ public class PaperWorldConfig {
2016-02-29 23:09:49 +00:00
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 5c5038402..4c168d333 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
2016-11-17 02:23:38 +00:00
@@ -80,6 +80,16 @@ public class EntityFallingBlock extends Entity {
2016-06-09 03:57:14 +00:00
}
2016-02-29 23:09:49 +00:00
2016-11-17 02:23:38 +00:00
this.move(EnumMoveType.SELF, this.motX, this.motY, this.motZ);
2016-02-29 23:09:49 +00:00
+
+ // Paper start - Configurable EntityFallingBlock height nerf
+ if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
+ if (this.dropItem && this.world.getGameRules().getBoolean("doEntityDrops")) {
2016-02-29 23:09:49 +00:00
+ 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 0fbdbd69b..fd0735611 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
2016-11-17 02:23:38 +00:00
@@ -56,6 +56,13 @@ public class EntityTNTPrimed extends Entity {
2016-06-09 03:57:14 +00:00
}
2016-11-17 02:23:38 +00:00
this.move(EnumMoveType.SELF, this.motX, this.motY, this.motZ);
2016-02-29 23:09:49 +00:00
+
+ // 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.12.0.windows.1
2016-02-29 23:09:49 +00:00