2015-05-30 06:39:20 +00:00
|
|
|
From 656b4cb5ee5ec6dba6f69f3abfe48268565f0a0d Mon Sep 17 00:00:00 2001
|
2015-01-29 21:34:32 +00:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
2015-02-23 21:03:10 +00:00
|
|
|
Date: Mon, 23 Feb 2015 14:57:28 -0600
|
2015-01-29 21:34:32 +00:00
|
|
|
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
|
2015-03-08 01:16:09 +00:00
|
|
|
index 1470c21..79837ef 100644
|
2015-01-29 21:34:32 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2015-03-08 01:16:09 +00:00
|
|
|
@@ -247,6 +247,13 @@ public abstract class Entity implements ICommandListener {
|
2015-01-29 21:34:32 +00:00
|
|
|
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) {
|
2015-03-08 01:16:09 +00:00
|
|
|
@@ -323,7 +330,7 @@ public abstract class Entity implements ICommandListener {
|
2015-01-29 21:34:32 +00:00
|
|
|
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
|
2015-03-08 01:16:09 +00:00
|
|
|
index f33142a..a6d8532 100644
|
2015-01-29 21:34:32 +00:00
|
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
2015-03-08 01:16:09 +00:00
|
|
|
@@ -186,4 +186,10 @@ public class PaperSpigotWorldConfig
|
2015-01-29 21:34:32 +00:00
|
|
|
{
|
2015-02-23 21:03:10 +00:00
|
|
|
boatsDropBoats = getBoolean( "game-mechanics.boats-drop-boats", false );
|
2015-01-29 21:34:32 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean netherVoidTopDamage;
|
|
|
|
+ private void nethervoidTopDamage()
|
|
|
|
+ {
|
|
|
|
+ netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
--
|
2015-05-30 06:11:16 +00:00
|
|
|
2.4.1.windows.1
|
2015-01-29 21:34:32 +00:00
|
|
|
|