mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From e93a887f22af6046e4070afd97c9d5b8033a202d 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..ca8f957989 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 ? 0.2F : 0.0F); // Purpur
|
|
}
|
|
}
|
|
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
index c618169db3..2de81f0d3e 100644
|
|
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
+++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
|
|
@@ -149,6 +149,11 @@ public class PurpurWorldConfig {
|
|
lavaInfinite = getBoolean("settings.lava-flow.infinite", lavaInfinite);
|
|
}
|
|
|
|
+ public boolean hayBlockFallDamage = true;
|
|
+ private void hayBlockFallDamage() {
|
|
+ hayBlockFallDamage = getBoolean("hay-block-fall-damage", hayBlockFallDamage);
|
|
+ }
|
|
+
|
|
public int limitPillagerOutpostSpawns = 10;
|
|
private void limitPillagerOutpostSpawns() {
|
|
limitPillagerOutpostSpawns = getInt("limit-pillager-outpost-spawns", limitPillagerOutpostSpawns);
|
|
--
|
|
2.24.0
|
|
|