From 35478e5d1a29397305e7c48247c5fe853074d2a2 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 23:58:50 -0600 Subject: [PATCH] Configurable top of nether void damage diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java index 1ed58f4bb..39d565db1 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -124,4 +124,10 @@ public class PaperWorldConfig { if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf); if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf); } + + public boolean netherVoidTopDamage; + private void netherVoidTopDamage() { + netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false ); + log("Top of the nether void damage: " + netherVoidTopDamage); + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index ca5212f20..f57c5b6a4 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.fallDistance *= 0.5F; } + // Paper start - Configurable nether ceiling damage + // Extracted to own function + /* if (this.locY < -64.0D) { this.aa(); } + */ + this.checkAndDoHeightDamage(); + // Paper end if (!this.world.isClientSide) { this.setFlag(0, this.fireTicks > 0); @@ -473,6 +479,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.world.methodProfiler.exit(); } + // Paper start + protected void checkAndDoHeightDamage() { + if (this.locY < -64.0D || (this.world.paperConfig.netherVoidTopDamage && this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= 128.0D)) { + this.kill(); + } + } + // Paper end + protected void E() { if (this.portalCooldown > 0) { --this.portalCooldown; @@ -524,6 +538,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.fireTicks = 0; } + protected final void kill() { this.aa(); } // Paper - OBFHELPER protected void aa() { this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java index 9000d2d7b..a8a64d054 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -193,9 +193,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT this.setDamage(this.getDamage() - 1.0F); } + // Paper start - Configurable nether ceiling damage + // Extracted to own function + /* if (this.locY < -64.0D) { this.aa(); } + */ + this.checkAndDoHeightDamage(); + // Paper end int i; -- 2.20.1