From 0000000000000000000000000000000000000000 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 1cfa6ae0a2fc42cd83c1323d49151ec2bbbacf83..08281351cc99e904a3a388607425dde4c83f13e2 100644 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java @@ -175,4 +175,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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java index ff233d417d3f4f8fa4fa9ae9e77de7640102a172..6bc8c8e15e66cd54cbb6ebc6d09a6fe8652b5d18 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -634,7 +634,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, i } public void checkOutOfWorld() { - if (this.getY() < (double) (this.level.getMinBuildHeight() - 64)) { + // Paper start - Configurable nether ceiling damage + if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER + && level.paperConfig.doNetherTopVoidDamage() + && this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) { + // Paper end this.outOfWorld(); }