From 8201047f785d64f4430a984a434aa6a22d4b31e9 Mon Sep 17 00:00:00 2001
From: Oth3r <oth3rone@outlook.com>
Date: Wed, 7 Aug 2024 11:27:40 -0500
Subject: [PATCH] include all custom blocks for non sitable with hand if the
 block has an interaction

---
 src/main/java/one/oth3r/sit/utl/Utl.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index b015cb7..efc9b02 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -161,6 +161,9 @@ public class Utl {
         ServerConfig config = FileData.getServerConfig();
         Block block = blockState.getBlock();
 
+        // make sure that the block that is being sit on has no interaction when hand sitting
+        if (hit != null && blockState.onUse(player.getWorld(), player, hit).isAccepted()) return null;
+
         // only if custom is enabled
         if (config.isCustomEnabled()) {
             // if the block is on the blacklist, false
@@ -183,9 +186,7 @@ public class Utl {
             && block instanceof CarpetBlock) return CARPET;
         if (config.getPresetBlocks().isFullBlocks()
                 // make sure the block is a full cube
-                && blockState.isFullCube(player.getWorld(),blockPos)
-                // make sure there isn't an action for the block IF the hit isn't null (manual command / no right click check)
-                && (hit == null || !blockState.onUse(player.getWorld(), player, hit).isAccepted())) return 1.0;
+                && blockState.isFullCube(player.getWorld(),blockPos)) return 1.0;
 
         // at the end, return false
         return null;