Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream

Browse Source
This commit is contained in:
Ben Kerllenevich
2022-06-09 07:12:26 -04:00
parent 9ab5b07c78
commit 4b168c7792
41 changed files with 253 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0059-Configurable-void-damage-height-and-damage.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height and damage
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 10c46a38e55463f584afc69bd6af91ee96862fd8..7735941f4a23e1baffc97055853bb88ef99954f3 100644
index 8587820d268c20b7fcae2cc633ddb3c6709836a5..e5097185d44062427e7fe21da89a552a4ff97277 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -851,7 +851,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -14,11 +14,11 @@ index 10c46a38e55463f584afc69bd6af91ee96862fd8..7735941f4a23e1baffc97055853bb88e
// Paper start - Configurable nether ceiling damage
- if (this.getY() < (double) (this.level.getMinBuildHeight() - 64) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
+ if (this.getY() < (double) (this.level.getMinBuildHeight() + level.purpurConfig.voidDamageHeight) || (this.level.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER // Purpur
&& level.paperConfig.doNetherTopVoidDamage()
&& this.getY() >= this.level.paperConfig.netherVoidTopDamageHeight)) {
&& level.paperConfig().environment.netherCeilingVoidDamageHeight > 0
&& this.getY() >= this.level.paperConfig().environment.netherCeilingVoidDamageHeight)) {
// Paper end
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 38067bee49ec2498d840ded86ceeae4518034ae1..7558c7fe7797cf6e100aeb5668fe8246de310d7b 100644
index 8e2fbf9f356650be37099d4e72cd949ddcc52ec6..0a481fca2e115a48cf10fa6f664b1cbecd5763a7 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2445,7 +2445,7 @@ public abstract class LivingEntity extends Entity {