mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 08:57:44 +01:00
193c511fce
Upstream has released updates that appears to apply and compile correctly Paper Changes: a4f066cc Fix method profiler inbalance introduced in a2a9ffe (#3132) c65dcad3 Don't delay chunk unloads during entity ticking bc17ce69 Delay unsafe actions until after entity ticking is done - Fixes #3114 5553e6b3 Disable Sync Events firing Async errors during shutdown e12c51d9 Use better variable for isStopping() API 586ee2bb Remove patch for MC-111480, fixed in 1.14 09a94215 Remove streams from Mob AI System bb5c294e Fix Disabling Asynchronous Chunks 089d8356 Implement Chunk Priority / Urgency System for World Gen fce69af7 Use dedicated thread for main thread blocking chunk loads 588b62e4 Add tick times API and /mspt command (#3102) 11de41c7 Add API MinecraftServer#isStopping (#3129) 942ff3c2 My patches are under MIT (#3130)
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 24f1c083e54f296ccd53e0c171b45624c3bbc191 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 44786e1fc9..c3c76a6fca 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
|
|
|