Fix adminprivate events

gradle.properties

@@ -12,7 +12,7 @@ makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=AspeKt
 makeevrserg.project.group=ru.astrainteractive.aspekt
-makeevrserg.project.version.string=2.29.3
+makeevrserg.project.version.string=2.29.4
 makeevrserg.project.description=Essentials plugin for EmpireProjekt
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://empireprojekt.ru

modules/adminprivate/src/main/kotlin/ru/astrainteractive/aspekt/module/adminprivate/event/AdminPrivateEvent.kt

@@ -10,17 +10,21 @@ import org.bukkit.entity.Monster
 import org.bukkit.entity.Player
 import org.bukkit.event.Cancellable
 import org.bukkit.event.Event
+import org.bukkit.event.EventHandler
 import org.bukkit.event.block.Action
 import org.bukkit.event.block.BlockBreakEvent
 import org.bukkit.event.block.BlockBurnEvent
 import org.bukkit.event.block.BlockExplodeEvent
 import org.bukkit.event.block.BlockFromToEvent
 import org.bukkit.event.block.BlockIgniteEvent
 import org.bukkit.event.block.BlockPistonEvent
+import org.bukkit.event.block.BlockPistonExtendEvent
+import org.bukkit.event.block.BlockPistonRetractEvent
 import org.bukkit.event.block.BlockPlaceEvent
 import org.bukkit.event.block.BlockSpreadEvent
 import org.bukkit.event.entity.EntityDamageByEntityEvent
 import org.bukkit.event.entity.EntityDamageEvent
+import org.bukkit.event.entity.EntityExplodeEvent
 import org.bukkit.event.entity.EntitySpawnEvent
 import org.bukkit.event.entity.ExplosionPrimeEvent
 import org.bukkit.event.hanging.HangingBreakByEntityEvent
@@ -66,6 +70,7 @@ internal class AdminPrivateEvent(
         }
     }
 
+    @EventHandler
     fun blockBreakEvent(e: BlockBreakEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.block.chunk, e.player, "blockBreakEvent"),
@@ -76,6 +81,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun blockPlaceEvent(e: BlockPlaceEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.block.chunk, e.player, "blockPlaceEvent"),
@@ -86,6 +92,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun interactEvent(e: PlayerInteractEvent) {
         val location = e.interactionPoint ?: e.player.location
         if (e.action == Action.LEFT_CLICK_AIR) return
@@ -99,6 +106,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun itemFrameEvent(e: PlayerItemFrameChangeEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.player.location, e.player, "itemFrameEvent"),
@@ -109,6 +117,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun breakItemFrameEvent(e: HangingBreakByEntityEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.entity.location, e.entity, "breakItemFrameEvent"),
@@ -119,6 +128,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun armorStandEvent(e: PlayerArmorStandManipulateEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.player.location, e.player, "armorStandEvent"),
@@ -129,6 +139,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun armorStandBreakEvent(e: EntityDamageByEntityEvent) {
         val armorStand = e.entity as? ArmorStand ?: return
         handleDefault(
@@ -141,6 +152,7 @@ internal class AdminPrivateEvent(
     }
 
     // Explosions
+    @EventHandler
     fun onBlockExplode(e: BlockExplodeEvent) {
         e.blockList().forEach { block ->
             handleDefault(
@@ -153,7 +165,8 @@ internal class AdminPrivateEvent(
         }
     }
 
-    fun onEntityExplode(e: BlockExplodeEvent) {
+    @EventHandler
+    fun onEntityExplode(e: EntityExplodeEvent) {
         e.blockList().forEach { block ->
             handleDefault(
                 retractKey = RetractKey.Vararg(block.chunk, "onEntityExplode"),
@@ -165,6 +178,7 @@ internal class AdminPrivateEvent(
         }
     }
 
+    @EventHandler
     fun onPrimeExplosion(e: ExplosionPrimeEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.entity.location.chunk, "onPrimeExplosion"),
@@ -176,6 +190,7 @@ internal class AdminPrivateEvent(
     }
 
     // Placing
+    @EventHandler
     fun onBucketEmptyEvent(e: PlayerBucketEmptyEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.blockClicked.location.chunk, "onBucketEmptyEvent"),
@@ -186,6 +201,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun onTntLavaPlace(e: BlockPlaceEvent) {
         if (!listOf(Material.TNT, Material.LAVA, Material.LAVA_BUCKET).contains(e.blockPlaced.type)) return
         handleDefault(
@@ -197,6 +213,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun onBlockFromTo(e: BlockFromToEvent) {
         if (!listOf(Material.LAVA, Material.LAVA_BUCKET).contains(e.block.type)) return
         handleDefault(
@@ -208,6 +225,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun onBlockIgniteEvent(e: BlockIgniteEvent) {
         val location = (e.ignitingBlock ?: e.block).location
         handleDefault(
@@ -219,6 +237,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun onBlockBurnEvent(e: BlockBurnEvent) {
         val location = (e.ignitingBlock ?: e.block).location
         handleDefault(
@@ -230,6 +249,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun onBlockSpread(e: BlockSpreadEvent) {
         if (!listOf(Material.LAVA, Material.FIRE).contains(e.block.type)) return
         handleDefault(
@@ -241,6 +261,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun playerDamageEvent(e: EntityDamageEvent) {
         val player = e.entity as? Player ?: return
         handleDefault(
@@ -252,6 +273,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun entitySpawnEvent(e: EntitySpawnEvent) {
         if (e.entity !is Monster || e.entity !is Enemy) return
         handleDefault(
@@ -263,6 +285,7 @@ internal class AdminPrivateEvent(
         )
     }
 
+    @EventHandler
     fun portalCreateEvent(e: PortalCreateEvent) {
         val chunks = e.blocks
             .map(BlockState::getLocation)
@@ -282,7 +305,7 @@ internal class AdminPrivateEvent(
         }
     }
 
-    fun pistonEvent(e: BlockPistonEvent) {
+    private fun pistonEvent(e: BlockPistonEvent) {
         handleDefault(
             retractKey = RetractKey.Vararg(e.block.location.chunk, "BlockPistonEvent"),
             e = e,
@@ -291,4 +314,14 @@ internal class AdminPrivateEvent(
             flag = ChunkFlag.PLACE
         )
     }
+
+    @EventHandler
+    fun onBlockPistonExtendEvent(e: BlockPistonExtendEvent) {
+        pistonEvent(e)
+    }
+
+    @EventHandler
+    fun onBlockPistonRetractEvent(e: BlockPistonRetractEvent) {
+        pistonEvent(e)
+    }
 }