mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-17 16:37:43 +01:00
3d455ff2d5
Upstream has released updates that appear to apply and compile correctly Paper Changes: e4633ca27 [Auto] Updated Upstream (Bukkit/CraftBukkit) a23be44da [Auto] Updated Upstream (CraftBukkit) e40ea889d [CI-SKIP] Deprecate the view distance APIs on Player (#4945) d9fd54e16 Do not crash from invalid ingredient lists in VillagerAcquireTradeEvent 24388381a Fix lead duplication Tuinity Changes: 09423b6 Update to Starlight 0.0.2-RC3 f06591a Update Upstream (Paper) d2aa70f Revert special block lookup for chunksection
38 lines
2.4 KiB
Diff
38 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Thu, 27 Feb 2020 21:42:19 -0600
|
|
Subject: [PATCH] Configurable void damage height
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 85f7c97136195bd7c77685244e89ceedec72dee5..2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
|
|
// Paper start
|
|
protected void performVoidDamage() {
|
|
- if (this.locY() < -64.0D || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER
|
|
+ if (this.locY() < world.purpurConfig.voidDamageHeight || (this.world.getWorld().getEnvironment() == org.bukkit.World.Environment.NETHER // Purpur
|
|
&& world.paperConfig.doNetherTopVoidDamage()
|
|
&& this.locY() >= world.paperConfig.netherVoidTopDamageHeight)) {
|
|
this.doVoidDamage();
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index d54f699aba5c73704f2c739f8fb3f8becf8288ad..046c6e688c64c6f2b2d11c8d356ce0b738e7fc6e 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -116,11 +116,13 @@ public class PurpurWorldConfig {
|
|
public boolean entitiesPickUpLootBypassMobGriefing = false;
|
|
public boolean milkCuresBadOmen = true;
|
|
public double tridentLoyaltyVoidReturnHeight = 0.0D;
|
|
+ public double voidDamageHeight = -64.0D;
|
|
private void miscGameplayMechanicsSettings() {
|
|
disableDropsOnCrammingDeath = getBoolean("gameplay-mechanics.disable-drops-on-cramming-death", disableDropsOnCrammingDeath);
|
|
entitiesPickUpLootBypassMobGriefing = getBoolean("gameplay-mechanics.entities-pick-up-loot-bypass-mob-griefing", entitiesPickUpLootBypassMobGriefing);
|
|
milkCuresBadOmen = getBoolean("gameplay-mechanics.milk-cures-bad-omen", milkCuresBadOmen);
|
|
tridentLoyaltyVoidReturnHeight = getDouble("gameplay-mechanics.trident-loyalty-void-return-height", tridentLoyaltyVoidReturnHeight);
|
|
+ voidDamageHeight = getDouble("gameplay-mechanics.void-damage-height", voidDamageHeight);
|
|
}
|
|
|
|
public String playerDeathExpDropEquation = "expLevel * 7";
|