Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 17:37:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge in Tuinity patches

Browse Source
This commit is contained in:
William Blake Galbreath
2020-03-08 12:49:59 -05:00
parent c8a65b216f
commit a32448bda1
140 changed files with 11159 additions and 1947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patches/server/0086-Option-for-hay-block-fall-damage.patch Normal file
View File

@@ -0,0 +1,41 @@
From d4f7108c9a78737c07805a4e89b949e4aaf3b21e 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 ca81c49f0..1f8f60542 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 ae402ff52..98dc35fc8 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