refactor: clean up laser permission checks

SwitchCraftCC · Apr 7, 2024 · 5acef3a · 5acef3a
1 parent ec67fce
commit 5acef3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ systemProp.kotlinVersion = 1.9.23
 fabricKotlinVersion = 1.10.19+kotlin.1.9.23
 
 # Mod Properties
-modVersion = 1.11.4
+modVersion = 1.11.6
 mavenGroup = io.sc3
 
 # Dependencies

diff --git a/src/main/java/io/sc3/plethora/gameplay/modules/laser/LaserEntity.kt b/src/main/java/io/sc3/plethora/gameplay/modules/laser/LaserEntity.kt
@@ -263,7 +263,7 @@ class LaserEntity : Entity, IPlayerOwnable {
         // Ensure the player is set up correctly
         syncPositions(true)
 
-        if (!world.canPlayerModifyAt(player, position)) {
+        if (!canBreakBlock(world, position, false, player)) {
           potency = -1f
           return
         }
@@ -273,10 +273,8 @@ class LaserEntity : Entity, IPlayerOwnable {
           potency -= hardness
 
           // Ignite TNT blocks
-          if (canBreakBlock(world, position, false, player)) {
-            TntBlockInvoker.invokePrimeTnt(world, position, player)
-            world.removeBlock(position, false)
-          }
+          TntBlockInvoker.invokePrimeTnt(world, position, player)
+          world.removeBlock(position, false)
         } else if (block === Blocks.OBSIDIAN) {
           potency -= hardness
 
@@ -285,13 +283,8 @@ class LaserEntity : Entity, IPlayerOwnable {
           val offsetState = world.getBlockState(offset)
           if (!offsetState.isAir) return
 
-          // Check that both the obsidian and the offset side (fire placement location) are trusted
-          if (
-            !world.server.isSpawnProtected(world, position, player)
-            && !world.server.isSpawnProtected(world, offset, player)
-            && canBreakBlock(world, position, false, player)
-            && canBreakBlock(world, offset, false, player)
-          ) {
+          // The obsidian block is checked above, but check the place we're putting the fire too
+          if (canBreakBlock(world, offset, false, player)) {
             world.playSound(null, offset, ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 1.0f,
               rand.nextFloat() * 0.4f + 0.8f)
             world.setBlockState(offset, Blocks.FIRE.defaultState)