1.8.8 compat

CitizensDev · Dec 10, 2022 · 57d27f3 · 57d27f3
1 parent 4212921
commit 57d27f3
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java b/main/src/main/java/net/citizensnpcs/trait/SleepTrait.java
@@ -48,11 +48,20 @@ public void run() {
 
         if (npc.getEntity() instanceof Player) {
             Player player = (Player) npc.getEntity();
-            if ((SUPPORT_BLOCKDATA && at.getBlock().getBlockData() instanceof Bed)
-                    || at.getBlock().getState() instanceof Bed) {
-                player.sleep(at, true);
-            } else {
+            if (!SUPPORT_BLOCKSTATE) {
                 NMS.sleep(player, true);
+            } else {
+                try {
+                    if ((SUPPORT_BLOCKDATA && at.getBlock().getBlockData() instanceof Bed)
+                            || at.getBlock().getState() instanceof Bed) {
+                        player.sleep(at, true);
+                    } else {
+                        NMS.sleep(player, true);
+                    }
+                } catch (Throwable t) {
+                    SUPPORT_BLOCKSTATE = false;
+                    NMS.sleep(player, true);
+                }
             }
             sleeping = true;
         } else if (npc.getEntity() instanceof Villager) {
@@ -75,4 +84,5 @@ private void wakeup() {
     }
 
     private static Boolean SUPPORT_BLOCKDATA = null;
+    private static boolean SUPPORT_BLOCKSTATE = true;
 }