Fix null entity in onUseEntity

ickerio · Jun 20, 2024 · fbe5bcf · fbe5bcf
1 parent bdd67b0
commit fbe5bcf
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/io/icker/factions/core/InteractionManager.java b/src/main/java/io/icker/factions/core/InteractionManager.java
@@ -142,8 +142,14 @@ private static ActionResult onAttackEntity(PlayerEntity player, World world, Han
     }
 
     private static ActionResult onUseEntity(PlayerEntity player, Entity entity, World world) {
-        if (checkPermissions(player, entity.getBlockPos(), world,
-                Permissions.USE_ENTITIES) == ActionResult.FAIL) {
+        BlockPos pos;
+        if (entity == null) {
+            pos = player.getBlockPos();
+        } else {
+            pos = entity.getBlockPos();
+        }
+
+        if (checkPermissions(player, pos, world, Permissions.USE_ENTITIES) == ActionResult.FAIL) {
             InteractionsUtil.warn(player, "use entities");
             return ActionResult.FAIL;
         }