94 lines
4.0 KiB
Diff
94 lines
4.0 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 fd5b41ceb97dc8aa975f1c0ae05b58d0b09f2cd6..f3f48c268639937874dd39eea9bd8e119eebdce7 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
||
|
@@ -499,9 +499,16 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
this.fallDistance *= 0.5F;
|
||
|
}
|
||
|
|
||
|
- if (this.getY() < -64.0D) {
|
||
|
- this.outOfWorld();
|
||
|
+ // Paper start - Configurable nether ceiling damage
|
||
|
+
|
||
|
+ // Extracted to own function
|
||
|
+ /*
|
||
|
+ if (this.locY() < -64.0D) {
|
||
|
+ this.an();
|
||
|
}
|
||
|
+ */
|
||
|
+ this.performVoidDamage();
|
||
|
+ // Paper end
|
||
|
|
||
|
if (!this.level.isClientSide) {
|
||
|
this.setSharedFlag(0, this.remainingFireTicks > 0);
|
||
|
@@ -594,6 +601,17 @@ public abstract class Entity implements Nameable, CommandSource, net.minecraft.s
|
||
|
this.setRemainingFireTicks(0);
|
||
|
}
|
||
|
|
||
|
+ // Paper start
|
||
|
+ protected void performVoidDamage() {
|
||
|
+ if (this.getY() < -64.0D || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
|
||
|
+ && level.paperConfig.doNetherTopVoidDamage()
|
||
|
+ && this.getY() >= level.paperConfig.netherVoidTopDamageHeight)) {
|
||
|
+ this.doVoidDamage();
|
||
|
+ }
|
||
|
+ }
|
||
|
+ // Paper end
|
||
|
+
|
||
|
+ protected final void doVoidDamage() { this.outOfWorld(); } // Paper - OBFHELPER
|
||
|
protected void outOfWorld() {
|
||
|
this.remove();
|
||
|
}
|
||
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
||
|
index 9503376895d90e8db0d4f7b164e2d813dd1a4a3a..7ba74b0a9319e29077b5afe3019a463ed3004813 100644
|
||
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
||
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java
|
||
|
@@ -329,9 +329,15 @@ public abstract class AbstractMinecart extends Entity {
|
||
|
this.setDamage(this.getDamage() - 1.0F);
|
||
|
}
|
||
|
|
||
|
- if (this.getY() < -64.0D) {
|
||
|
- this.outOfWorld();
|
||
|
+ // Paper start - Configurable nether ceiling damage
|
||
|
+ // Extracted to own function
|
||
|
+ /*
|
||
|
+ if (this.locY() < -64.0D) {
|
||
|
+ this.an();
|
||
|
}
|
||
|
+ */
|
||
|
+ this.performVoidDamage();
|
||
|
+ // Paper end
|
||
|
|
||
|
// this.doPortalTick(); // CraftBukkit - handled in postTick
|
||
|
if (this.level.isClientSide) {
|