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

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c389b1c Fix configs that relied on outdated min/max y levels (#6986)
PaperMC/Paper@57555b8 Add missing structure set seed configs (#8030)
This commit is contained in:
BillyGalbreath
2022-10-09 23:55:46 -05:00
parent c577b117e7
commit 38313f701e
15 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0060-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 80f075b79079486ee6fcb7bcf78d6d091d1b853e..bd9cd4423f51e204937b4b2bd8289119c7439f7b 100644
index 4adb8488e2279d6fdf0c8d17de629b597444b468..feaf813a5fbecafe5826af9945f2232d605e2899 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -891,7 +891,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -14,9 +14,9 @@ index 80f075b79079486ee6fcb7bcf78d6d091d1b853e..bd9cd4423f51e204937b4b2bd8289119
// 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().environment.netherCeilingVoidDamageHeight > 0
&& this.getY() >= this.level.paperConfig().environment.netherCeilingVoidDamageHeight
&& this.level.paperConfig().environment.netherCeilingVoidDamageHeight.test(v -> this.getY() >= v)
&& (!(this instanceof Player player) || !player.getAbilities().invulnerable))) {
// 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 29d33251d0b712b141c2ed8c78d0913b7b924c3c..1f0f31269fa21348cd8617a8e2d098dc2a8d0f85 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java