From 818582f409401817e7331a6e31e25a1ae4832ad8 Mon Sep 17 00:00:00 2001
From: Parker Hawke <hawkeboyz2@hotmail.com>
Date: Thu, 13 Apr 2023 07:08:26 +1000
Subject: [PATCH] #1169: Add damage methods to FallingBlock

---
 .../entity/item/EntityFallingBlock.patch      | 11 +++++++
 .../craftbukkit/entity/CraftFallingBlock.java | 31 +++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch b/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
index 1944e092e..06950aa92 100644
--- a/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
+++ b/nms-patches/net/minecraft/world/entity/item/EntityFallingBlock.patch
@@ -9,6 +9,17 @@
  public class EntityFallingBlock extends Entity {
  
      private static final Logger LOGGER = LogUtils.getLogger();
+@@ -57,8 +59,8 @@
+     public boolean dropItem;
+     private boolean cancelDrop;
+     public boolean hurtEntities;
+-    private int fallDamageMax;
+-    private float fallDamagePerDistance;
++    public int fallDamageMax;
++    public float fallDamagePerDistance;
+     @Nullable
+     public NBTTagCompound blockData;
+     protected static final DataWatcherObject<BlockPosition> DATA_START_POS = DataWatcher.defineId(EntityFallingBlock.class, DataWatcherRegistry.BLOCK_POS);
 @@ -83,10 +85,17 @@
      }
  
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
index a1e5d5a8e..c78c13e2f 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFallingBlock.java
@@ -1,5 +1,6 @@
 package org.bukkit.craftbukkit.entity;
 
+import com.google.common.base.Preconditions;
 import net.minecraft.world.entity.item.EntityFallingBlock;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
@@ -66,4 +67,34 @@ public class CraftFallingBlock extends CraftEntity implements FallingBlock {
         // Second field for EntityFallingBlock
         getHandle().time = value;
     }
+
+    @Override
+    public float getDamagePerBlock() {
+        return getHandle().fallDamagePerDistance;
+    }
+
+    @Override
+    public void setDamagePerBlock(float damage) {
+        Preconditions.checkArgument(damage >= 0.0, "damage must be >= 0.0, given %s", damage);
+
+        getHandle().fallDamagePerDistance = damage;
+        if (damage > 0.0) {
+            this.setHurtEntities(true);
+        }
+    }
+
+    @Override
+    public int getMaxDamage() {
+        return getHandle().fallDamageMax;
+    }
+
+    @Override
+    public void setMaxDamage(int damage) {
+        Preconditions.checkArgument(damage >= 0, "damage must be >= 0, given %s", damage);
+
+        getHandle().fallDamageMax = damage;
+        if (damage > 0) {
+            this.setHurtEntities(true);
+        }
+    }
 }