2019-04-05 04:52:02 +00:00
|
|
|
From 49b42c949cd1c28bcf4fb9ff73e86810e4ed5d90 Mon Sep 17 00:00:00 2001
|
2016-02-29 23:09:49 +00:00
|
|
|
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
|
2019-04-05 04:52:02 +00:00
|
|
|
index 1ed58f4bb..6eddceb06 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2019-04-05 04:52:02 +00:00
|
|
|
@@ -124,4 +124,18 @@ public class PaperWorldConfig {
|
2018-07-15 01:53:17 +00:00
|
|
|
if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
|
|
|
|
if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
+
|
2019-04-05 04:52:02 +00:00
|
|
|
+ public int netherVoidTopDamageHeight;
|
|
|
|
+ private void netherVoidTopDamageHeight() {
|
|
|
|
+ netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 128);
|
|
|
|
+ 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);
|
|
|
|
+ }
|
|
|
|
+ }
|
2016-02-29 23:09:49 +00:00
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2019-04-05 04:52:02 +00:00
|
|
|
index bff44d535..040ecb2c1 100644
|
2016-02-29 23:09:49 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -461,9 +461,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-06-18 05:25:37 +00:00
|
|
|
this.fallDistance *= 0.5F;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
|
|
|
if (this.locY < -64.0D) {
|
2018-07-15 01:53:17 +00:00
|
|
|
this.aa();
|
2016-06-18 05:25:37 +00:00
|
|
|
}
|
|
|
|
+ */
|
2019-04-05 04:52:02 +00:00
|
|
|
+ this.performVoidDamage();
|
2016-06-18 05:25:37 +00:00
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
if (!this.world.isClientSide) {
|
|
|
|
this.setFlag(0, this.fireTicks > 0);
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -473,6 +479,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2018-12-17 05:18:06 +00:00
|
|
|
this.world.methodProfiler.exit();
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
|
2018-07-15 01:53:17 +00:00
|
|
|
+ // Paper start
|
2019-04-05 04:52:02 +00:00
|
|
|
+ protected void performVoidDamage() {
|
|
|
|
+ if (this.locY < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= world.paperConfig.netherVoidTopDamageHeight)) {
|
|
|
|
+ this.doVoidDamage();
|
2016-06-18 05:25:37 +00:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2018-07-15 01:53:17 +00:00
|
|
|
protected void E() {
|
2016-06-18 05:25:37 +00:00
|
|
|
if (this.portalCooldown > 0) {
|
|
|
|
--this.portalCooldown;
|
2019-01-15 21:12:19 +00:00
|
|
|
@@ -540,6 +554,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-06-18 05:25:37 +00:00
|
|
|
this.fireTicks = 0;
|
|
|
|
}
|
|
|
|
|
2019-04-05 04:52:02 +00:00
|
|
|
+ protected final void doVoidDamage() { this.aa(); } // Paper - OBFHELPER
|
2018-07-15 01:53:17 +00:00
|
|
|
protected void aa() {
|
2016-06-18 05:25:37 +00:00
|
|
|
this.die();
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
2019-04-05 04:52:02 +00:00
|
|
|
index 205251bcd..0f531e7d4 100644
|
2016-06-18 05:25:37 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -193,9 +193,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
|
2016-06-18 05:25:37 +00:00
|
|
|
this.setDamage(this.getDamage() - 1.0F);
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
|
|
|
|
2016-06-18 05:25:37 +00:00
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
|
|
|
if (this.locY < -64.0D) {
|
2018-07-15 01:53:17 +00:00
|
|
|
this.aa();
|
2016-02-29 23:09:49 +00:00
|
|
|
}
|
2016-06-18 05:25:37 +00:00
|
|
|
+ */
|
2019-04-05 04:52:02 +00:00
|
|
|
+ this.performVoidDamage();
|
2016-06-18 05:25:37 +00:00
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
int i;
|
2016-02-29 23:09:49 +00:00
|
|
|
|
|
|
|
--
|
2019-04-05 04:52:02 +00:00
|
|
|
2.21.0
|
2016-02-29 23:09:49 +00:00
|
|
|
|