From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 4 Nov 2021 11:50:40 -0700
Subject: [PATCH] Add isCollidable methods to various places

== AT ==
public net.minecraft.world.level.block.state.BlockBehaviour hasCollision

diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 8244ed8614a8f4bf95e5d8e8f22969cb54a8c17a..40d0610c1cdc4f7131ff36869a6983ee53b801f9 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -456,6 +456,11 @@ public class CraftBlock implements Block {
     public boolean isSolid() {
         return this.getNMS().blocksMotion();
     }
+
+    @Override
+    public boolean isCollidable() {
+        return getNMS().getBlock().hasCollision;
+    }
     // Paper end
 
     @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index 445838ee0ffdc6551e125de190abb91011f467b7..3c2e879799c6b6289b0ae467eae4ed950b0abeef 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -317,4 +317,11 @@ public class CraftBlockState implements BlockState {
     protected void requirePlaced() {
         Preconditions.checkState(this.isPlaced(), "The blockState must be placed to call this method");
     }
+
+    // Paper start
+    @Override
+    public boolean isCollidable() {
+        return this.data.getBlock().hasCollision;
+    }
+    // Paper end
 }
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
index 719273eeaab49570ef7efd5197c2f241a875e434..799a164245be1182c5ae2dff801c89147d4dbe64 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockType.java
@@ -175,4 +175,11 @@ public class CraftBlockType<B extends BlockData> implements BlockType<B> {
         return this.block.getDescriptionId();
     }
     // Paper end
+
+    // Paper start - isCollidable
+    @Override
+    public boolean isCollidable() {
+        return this.block.hasCollision;
+    }
+    // Paper end
 }