Remove guard clause causing unintended side effects

AtlasMediaGroup · Oct 5, 2022 · 91299b1 · 91299b1
1 parent 9f8dafb
commit 91299b1
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java b/src/main/java/me/totalfreedom/totalfreedommod/blocking/InteractBlocker.java
@@ -71,15 +71,13 @@ private void handleRightClick(PlayerInteractEvent event)
         final Player player = event.getPlayer();
         final Block clickedBlock = event.getClickedBlock();
 
-        if (clickedBlock == null)
+        if (clickedBlock != null)
         {
-            return;
-        }
-
-        if (clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
-        {
-            event.setCancelled(true);
-            return;
+            if (clickedBlock.getType() == Material.RESPAWN_ANCHOR && !ConfigEntry.ALLOW_RESPAWN_ANCHORS.getBoolean())
+            {
+                event.setCancelled(true);
+                return;
+            }
         }
 
         if (Groups.SPAWN_EGGS.contains(event.getMaterial()))
@@ -102,7 +100,7 @@ private void handleRightClick(PlayerInteractEvent event)
             {
                 //
             }
-            if (eggType != null)
+            if (eggType != null && clickedBlock != null)
             {
                 clickedBlock.getWorld().spawnEntity(clickedBlock.getLocation().add(event.getBlockFace().getDirection()).add(0.5, 0.5, 0.5), eggType);
             }