mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 09:19:38 +01:00
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From 66f764d702640b3cf873889ecc41ff921481bbfa Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Mon, 23 Feb 2015 14:57:28 -0600
|
|
Subject: [PATCH] Configurable top of nether void damage
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 3e89aa9..a3b4cdb 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -248,6 +248,13 @@ public abstract class Entity implements ICommandListener {
|
|
this.K();
|
|
}
|
|
|
|
+ /**
|
|
+ * PaperSpigot - Checks if the feature is enabled and the entity is above the nether world bedrock height
|
|
+ */
|
|
+ private boolean paperNetherCheck() {
|
|
+ return this.world.paperSpigotConfig.netherVoidTopDamage && this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= 128.0D;
|
|
+ }
|
|
+
|
|
public void K() {
|
|
this.world.methodProfiler.a("entityBaseTick");
|
|
if (this.vehicle != null && this.vehicle.dead) {
|
|
@@ -324,7 +331,7 @@ public abstract class Entity implements ICommandListener {
|
|
this.fallDistance *= 0.5F;
|
|
}
|
|
|
|
- if (this.locY < -64.0D) {
|
|
+ if (this.locY < -64.0D || paperNetherCheck()) { // PaperSpigot - Configurable top-of-nether void damage
|
|
this.O();
|
|
}
|
|
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
index 88ee38a..c1f21ae 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -228,4 +228,10 @@ public class PaperSpigotWorldConfig
|
|
{
|
|
boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
|
|
}
|
|
+
|
|
+ public boolean netherVoidTopDamage;
|
|
+ private void nethervoidTopDamage()
|
|
+ {
|
|
+ netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
|
|
+ }
|
|
}
|
|
--
|
|
2.5.2
|
|
|