From a0f544fdc476d10b40e8524b8ed958d13fa4fb1a 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..a797a5767 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -124,4 +124,19 @@ 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 int netherVoidTopDamageHeight; + public boolean doNetherTopVoidDamage() { return netherVoidTopDamageHeight > 0; } + private void netherVoidTopDamageHeight() { + netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 0); + log("Top of the nether void damage height: " + netherVoidTopDamageHeight); + + if (PaperConfig.version < 18) { + boolean legacy = getBoolean("nether-ceiling-void-damage", false); + if (legacy) { + netherVoidTopDamageHeight = 128; + set("nether-ceiling-void-damage-height", netherVoidTopDamageHeight); + } + } + } } diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 8f97aa296..1af797b66 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -398,9 +398,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.af(); } + */ + this.performVoidDamage(); + // Paper end if (!this.world.isClientSide) { this.setFlag(0, this.fireTicks > 0); @@ -410,6 +416,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.world.getMethodProfiler().exit(); } + // Paper start + protected void performVoidDamage() { + if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER + && world.paperConfig.doNetherTopVoidDamage() + && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) { + + this.doVoidDamage(); + } + } + // Paper end + protected void E() { if (this.portalCooldown > 0) { --this.portalCooldown; @@ -485,6 +502,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke this.fireTicks = 0; } + protected final void doVoidDamage() { this.af(); } // Paper - OBFHELPER protected void af() { this.die(); } diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java index ff5d12817..e1a684b37 100644 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java @@ -182,9 +182,15 @@ public abstract class EntityMinecartAbstract extends Entity { this.setDamage(this.getDamage() - 1.0F); } + // Paper start - Configurable nether ceiling damage + // Extracted to own function + /* if (this.locY < -64.0D) { this.af(); } + */ + this.performVoidDamage(); + // Paper end // this.doPortalTick(); // CraftBukkit - handled in postTick if (this.world.isClientSide) { -- 2.22.0