diff --git a/src/main/java/com/alttd/playershops/listener/PlayerListener.java b/src/main/java/com/alttd/playershops/listener/PlayerListener.java
index 7b0c881..841c3db 100644
--- a/src/main/java/com/alttd/playershops/listener/PlayerListener.java
+++ b/src/main/java/com/alttd/playershops/listener/PlayerListener.java
@@ -81,11 +81,10 @@ public class PlayerListener extends EventListener {
             return;
         BlockFace facing;
         BlockData data = b.getState().getBlockData();
-        if (data instanceof WallSign) {
-            facing = ((Directional) data).getFacing();
-        } else {
-            facing = ((Rotatable) data).getRotation();
+        if (!(data instanceof WallSign wallSign)) {
+            return;
         }
+        facing = wallSign.getFacing();
 
         Block bRelative = b.getRelative(facing.getOppositeFace());
 
diff --git a/src/main/java/com/alttd/playershops/listener/ShopListener.java b/src/main/java/com/alttd/playershops/listener/ShopListener.java
index 5875a1a..bea0b30 100644
--- a/src/main/java/com/alttd/playershops/listener/ShopListener.java
+++ b/src/main/java/com/alttd/playershops/listener/ShopListener.java
@@ -122,11 +122,10 @@ public class ShopListener extends EventListener {
 
         BlockFace facing;
         BlockData data = block.getState().getBlockData();
-        if (data instanceof WallSign) {
-            facing = ((Directional) data).getFacing();
-        } else {
-            facing = ((Rotatable) data).getRotation();
+        if (!(data instanceof WallSign wallSign)) {
+            return;
         }
+        facing = wallSign.getFacing();
 
         Block relativeBlock = block.getRelative(facing.getOppositeFace());
         PlayerShop shop = shopHandler.getShop(relativeBlock.getLocation());