From aaac1acff680d1926eff0a74d6ec4c476c542a00 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 27 Feb 2020 21:42:19 -0600 Subject: [PATCH] Configurable void damage height --- src/main/java/net/minecraft/server/Entity.java | 2 +- src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 0d509e8410..c85e794940 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -503,7 +503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke // Paper start protected void performVoidDamage() { - if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER + if (this.locY < world.purpurConfig.voidDamageHeight || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && world.paperConfig.doNetherTopVoidDamage() && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) { diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java index 7e467230a7..0180d76845 100644 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java @@ -198,6 +198,7 @@ public class PurpurWorldConfig { public String playerSleepCondition = "time >= 12541 && time <= 23458"; public boolean useBetterMending = false; public boolean saveProjectilesToDisk = true; + public double voidDamageHeight = -64.0D; private void gameplayMechanicsSettings() { armorstandStepHeight = (float) getDouble("gameplay-mechanics.armorstand.step-height", armorstandStepHeight); boatEjectPlayersOnLand = getBoolean("gameplay-mechanics.boat.eject-players-on-land", boatEjectPlayersOnLand); @@ -254,6 +255,7 @@ public class PurpurWorldConfig { set("gameplay-mechanics.saveProjectilesToDisk", null); } saveProjectilesToDisk = getBoolean("gameplay-mechanics.save-projectiles-to-disk", saveProjectilesToDisk); + voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight); } public int elytraDamagePerSecond = 1; -- 2.24.0