2018-07-24 08:24:44 +08:00
|
|
|
From 45fbad5474fc22989af2dac59e41e035ff3ea414 Mon Sep 17 00:00:00 2001
|
2016-03-01 07:09:49 +08: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
|
2018-07-24 08:24:44 +08:00
|
|
|
index 38a697e1b..68898d624 100644
|
2016-03-01 07:09:49 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-07-24 08:24:44 +08:00
|
|
|
@@ -124,4 +124,10 @@ public class PaperWorldConfig {
|
2018-07-15 09:53:17 +08: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-03-01 07:09:49 +08:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+ public boolean netherVoidTopDamage;
|
|
|
|
+ private void netherVoidTopDamage() {
|
|
|
|
+ netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
|
|
|
|
+ log("Top of the nether void damage: " + netherVoidTopDamage);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-24 08:24:44 +08:00
|
|
|
index 778b8d440..1870930f6 100644
|
2016-03-01 07:09:49 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -464,9 +464,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-06-18 13:25:37 +08:00
|
|
|
this.fallDistance *= 0.5F;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
|
|
|
if (this.locY < -64.0D) {
|
2018-07-15 09:53:17 +08:00
|
|
|
this.aa();
|
2016-06-18 13:25:37 +08:00
|
|
|
}
|
|
|
|
+ */
|
|
|
|
+ this.checkAndDoHeightDamage();
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
if (!this.world.isClientSide) {
|
|
|
|
this.setFlag(0, this.fireTicks > 0);
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -476,6 +482,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
|
|
this.world.methodProfiler.e();
|
2016-03-01 07:09:49 +08:00
|
|
|
}
|
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
+ // Paper start
|
2016-06-18 13:25:37 +08:00
|
|
|
+ protected void checkAndDoHeightDamage() {
|
2018-07-15 09:53:17 +08:00
|
|
|
+ if (this.locY < -64.0D || (this.world.paperConfig.netherVoidTopDamage && this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER && this.locY >= 128.0D)) {
|
2016-06-18 13:25:37 +08:00
|
|
|
+ this.kill();
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
2018-07-15 09:53:17 +08:00
|
|
|
protected void E() {
|
2016-06-18 13:25:37 +08:00
|
|
|
if (this.portalCooldown > 0) {
|
|
|
|
--this.portalCooldown;
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -532,6 +546,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
2016-06-18 13:25:37 +08:00
|
|
|
this.fireTicks = 0;
|
|
|
|
}
|
|
|
|
|
2018-07-15 09:53:17 +08:00
|
|
|
+ protected final void kill() { this.aa(); } // Paper - OBFHELPER
|
|
|
|
protected void aa() {
|
2016-06-18 13:25:37 +08:00
|
|
|
this.die();
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
2018-07-24 08:24:44 +08:00
|
|
|
index 6e48cf475..4644d7efe 100644
|
2016-06-18 13:25:37 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
|
2018-07-15 09:53:17 +08:00
|
|
|
@@ -201,9 +201,15 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
|
2016-06-18 13:25:37 +08:00
|
|
|
this.setDamage(this.getDamage() - 1.0F);
|
2016-03-01 07:09:49 +08:00
|
|
|
}
|
|
|
|
|
2016-06-18 13:25:37 +08:00
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
|
|
|
if (this.locY < -64.0D) {
|
2018-07-15 09:53:17 +08:00
|
|
|
this.aa();
|
2016-03-01 07:09:49 +08:00
|
|
|
}
|
2016-06-18 13:25:37 +08:00
|
|
|
+ */
|
|
|
|
+ this.checkAndDoHeightDamage();
|
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
int i;
|
2016-03-01 07:09:49 +08:00
|
|
|
|
|
|
|
--
|
2018-07-04 15:55:24 +08:00
|
|
|
2.18.0
|
2016-03-01 07:09:49 +08:00
|
|
|
|