mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
c0c212bf48
Upstream has released updates that appears to apply and compile correctly Paper Changes: b75eeca0 Boost light task priority to ensure it doesnt hold up chunk loads 3d2bc848 Ensure VillagerTrades doesn't load async - fixes #3495 e470f1ef Add more information to Timing Reports f4a47db6 Improve Thread Pool usage to allow single threads for single cpu servers a4fe910f Fix sounds when using worldedit regen command 70ad51a8 Updated Upstream (Bukkit/CraftBukkit) d7cfa4fa Improve legacy format serialization more
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 23fe49e9e75d1c3ba6d60df0a81f1cc5d363f25e Mon Sep 17 00:00:00 2001
|
|
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
|
|
Date: Sat, 30 Nov 2019 01:31:09 -0600
|
|
Subject: [PATCH] Option for hay block fall damage
|
|
|
|
---
|
|
src/main/java/net/minecraft/server/BlockHay.java | 2 +-
|
|
src/main/java/net/pl3x/purpur/PurpurWorldConfig.java | 5 +++++
|
|
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockHay.java b/src/main/java/net/minecraft/server/BlockHay.java
|
|
index ca81c49f0a..1f8f60542f 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockHay.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockHay.java
|
|
@@ -9,6 +9,6 @@ public class BlockHay extends BlockRotatable {
|
|
|
|
@Override
|
|
public void fallOn(World world, BlockPosition blockposition, Entity entity, float f) {
|
|
- entity.b(f, 0.2F);
|
|
+ entity.b(f, world.purpurConfig.hayBlockFallDamage); // Purpur
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index 08fb0bae3a..a4a09874fe 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -127,6 +127,11 @@ public class PurpurWorldConfig {
|
|
grindstoneBlacklist.addAll(blacklist);
|
|
}
|
|
|
|
+ public float hayBlockFallDamage = 0.2F;
|
|
+ private void hayBlockFallDamage() {
|
|
+ hayBlockFallDamage = (float) getDouble("blocks.hay_block.fall-damage", hayBlockFallDamage);
|
|
+ }
|
|
+
|
|
public boolean lavaInfinite = false;
|
|
private void lavaSettings() {
|
|
lavaInfinite = getBoolean("blocks.lava.infinite-source", lavaInfinite);
|
|
--
|
|
2.24.0
|
|
|