mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-20 03:13:29 +02:00
48 lines
2.5 KiB
Diff
48 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
||
|
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 d16ae924bcbe31c964f7fb448757c748e5c4418c..4bba6977a0287837b8927718c040ac61463f0469 100644
|
||
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
@@ -134,4 +134,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 84c2a14d7336d57d5db66d01c75e31a58860d96c..7e7291cc41735a6c251738492a4cdd1c7798066f 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
@@ -602,7 +602,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, n
|
||
|
}
|
||
|
|
||
|
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();
|
||
|
}
|
||
|
|