2021-06-12 00:37:16 +02:00
|
|
|
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
|
|
|
|
|
2022-10-09 08:52:09 +02:00
|
|
|
Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
|
2021-06-12 00:37:16 +02:00
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
|
2023-06-21 15:36:14 +02:00
|
|
|
index c0d19d31aece8abab310b4c7bffa2ffe7a8ac845..d20722a79aa87cae72b1b3b9039d342c9ff9570a 100644
|
2021-06-12 00:37:16 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
|
2023-06-08 07:21:04 +02:00
|
|
|
@@ -715,7 +715,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
|
2021-06-12 00:37:16 +02:00
|
|
|
}
|
|
|
|
|
2023-06-07 20:31:32 +02:00
|
|
|
public void checkBelowWorld() {
|
|
|
|
- if (this.getY() < (double) (this.level().getMinBuildHeight() - 64)) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ // Paper start - Configurable nether ceiling damage
|
|
|
|
+ if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
|
2022-10-09 08:52:09 +02:00
|
|
|
+ && this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
|
2022-10-07 20:43:26 +02:00
|
|
|
+ && (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
|
2021-06-12 00:37:16 +02:00
|
|
|
+ // Paper end
|
2023-06-07 20:31:32 +02:00
|
|
|
this.onBelowWorld();
|
2021-06-12 00:37:16 +02:00
|
|
|
}
|
|
|
|
|
2022-10-09 08:52:09 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
|
2023-06-07 20:31:32 +02:00
|
|
|
index 02e3322ec41108fe9275510e2daa833d180353dc..3668f9775f377434779a8e519b10a11cf7b14dd5 100644
|
2022-10-09 08:52:09 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/portal/PortalForcer.java
|
|
|
|
@@ -55,7 +55,7 @@ public class PortalForcer {
|
|
|
|
Optional<PoiRecord> optional = villageplace.getInSquare((holder) -> {
|
|
|
|
return holder.is(PoiTypes.NETHER_PORTAL);
|
|
|
|
}, blockposition, i, PoiManager.Occupancy.ANY).filter((villageplacerecord) -> {
|
|
|
|
- return worldborder.isWithinBounds(villageplacerecord.getPos());
|
|
|
|
+ return worldborder.isWithinBounds(villageplacerecord.getPos()) && !this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> villageplacerecord.getPos().getY() >= v); // Paper - don't teleport into void damage
|
|
|
|
}).sorted(Comparator.comparingDouble((PoiRecord villageplacerecord) -> { // CraftBukkit - decompile error
|
|
|
|
return villageplacerecord.getPos().distSqr(blockposition);
|
|
|
|
}).thenComparingInt((villageplacerecord) -> {
|
|
|
|
@@ -90,6 +90,11 @@ public class PortalForcer {
|
|
|
|
BlockPos blockposition2 = null;
|
|
|
|
WorldBorder worldborder = this.level.getWorldBorder();
|
|
|
|
int i = Math.min(this.level.getMaxBuildHeight(), this.level.getMinBuildHeight() + this.level.getLogicalHeight()) - 1;
|
|
|
|
+ // Paper start - if ceiling void damage is enabled, make sure the max height doesn't exceed the void damage height
|
|
|
|
+ if (this.level.paperConfig().environment.netherCeilingVoidDamageHeight.enabled()) {
|
|
|
|
+ i = Math.min(i, this.level.paperConfig().environment.netherCeilingVoidDamageHeight.intValue() - 1);
|
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
BlockPos.MutableBlockPos blockposition_mutableblockposition = blockposition.mutable();
|
|
|
|
Iterator iterator = BlockPos.spiralAround(blockposition, createRadius, Direction.EAST, Direction.SOUTH).iterator(); // CraftBukkit
|
|
|
|
|