2015-01-29 22:34:32 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Tue, 1 Mar 2016 23:58:50 -0600
|
2015-01-29 22:34:32 +01:00
|
|
|
Subject: [PATCH] Configurable top of nether void damage
|
|
|
|
|
|
|
|
|
2016-03-01 00:09:49 +01:00
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2016-03-01 00:09:49 +01:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
@@ -0,0 +0,0 @@ public class PaperWorldConfig {
|
2018-07-15 03:53:17 +02: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 00:09:49 +01:00
|
|
|
}
|
|
|
|
+
|
2019-04-05 06:52:02 +02:00
|
|
|
+ public int netherVoidTopDamageHeight;
|
2019-04-05 07:27:37 +02:00
|
|
|
+ public boolean doNetherTopVoidDamage() { return netherVoidTopDamageHeight > 0; }
|
2019-04-05 06:52:02 +02:00
|
|
|
+ private void netherVoidTopDamageHeight() {
|
2019-04-05 07:27:37 +02:00
|
|
|
+ netherVoidTopDamageHeight = getInt("nether-ceiling-void-damage-height", 0);
|
2019-04-05 06:52:02 +02:00
|
|
|
+ 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-03-01 00:09:49 +01:00
|
|
|
+ }
|
|
|
|
}
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
2016-06-18 07:25:37 +02:00
|
|
|
this.fallDistance *= 0.5F;
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
2019-12-11 01:56:03 +01:00
|
|
|
+
|
2016-06-18 07:25:37 +02:00
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
2019-12-11 01:56:03 +01:00
|
|
|
if (this.locY() < -64.0D) {
|
2020-11-03 03:22:15 +01:00
|
|
|
this.an();
|
2016-06-18 07:25:37 +02:00
|
|
|
}
|
|
|
|
+ */
|
2019-04-05 06:52:02 +02:00
|
|
|
+ this.performVoidDamage();
|
2016-06-18 07:25:37 +02:00
|
|
|
+ // Paper end
|
|
|
|
|
|
|
|
if (!this.world.isClientSide) {
|
|
|
|
this.setFlag(0, this.fireTicks > 0);
|
2021-03-16 08:19:45 +01:00
|
|
|
@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
|
2020-08-25 04:22:08 +02:00
|
|
|
this.setFireTicks(0);
|
2015-01-29 22:34:32 +01:00
|
|
|
}
|
|
|
|
|
2018-07-15 03:53:17 +02:00
|
|
|
+ // Paper start
|
2019-04-05 06:52:02 +02:00
|
|
|
+ protected void performVoidDamage() {
|
2020-06-25 11:27:25 +02:00
|
|
|
+ if (this.locY() < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
|
2019-04-05 07:27:37 +02:00
|
|
|
+ && world.paperConfig.doNetherTopVoidDamage()
|
2020-06-25 11:27:25 +02:00
|
|
|
+ && this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
|
2019-04-05 06:52:02 +02:00
|
|
|
+ this.doVoidDamage();
|
2016-06-18 07:25:37 +02:00
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
2020-11-03 03:22:15 +01:00
|
|
|
+
|
|
|
|
+ protected final void doVoidDamage() { this.an(); } // Paper - OBFHELPER
|
|
|
|
protected void an() {
|
2016-06-18 07:25:37 +02:00
|
|
|
this.die();
|
|
|
|
}
|
2021-03-16 08:19:45 +01:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java b/src/main/java/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java
|
2020-05-06 11:48:49 +02:00
|
|
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
2021-03-16 08:19:45 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/vehicle/EntityMinecartAbstract.java
|
2019-04-24 04:34:11 +02:00
|
|
|
@@ -0,0 +0,0 @@ public abstract class EntityMinecartAbstract extends Entity {
|
2016-06-18 07:25:37 +02:00
|
|
|
this.setDamage(this.getDamage() - 1.0F);
|
2015-01-29 22:34:32 +01:00
|
|
|
}
|
|
|
|
|
2016-06-18 07:25:37 +02:00
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ // Extracted to own function
|
|
|
|
+ /*
|
2019-12-11 01:56:03 +01:00
|
|
|
if (this.locY() < -64.0D) {
|
2020-11-03 03:22:15 +01:00
|
|
|
this.an();
|
2015-01-29 22:34:32 +01:00
|
|
|
}
|
2016-06-18 07:25:37 +02:00
|
|
|
+ */
|
2019-04-05 06:52:02 +02:00
|
|
|
+ this.performVoidDamage();
|
2016-06-18 07:25:37 +02:00
|
|
|
+ // Paper end
|
|
|
|
|
2019-04-24 04:34:11 +02:00
|
|
|
// this.doPortalTick(); // CraftBukkit - handled in postTick
|
|
|
|
if (this.world.isClientSide) {
|