Fixed WrappedPlayerInteractEvent call order

xenondevs · Nov 5, 2022 · 39752d2 · 39752d2
1 parent dbeecad
commit 39752d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/item/ItemListener.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/item/ItemListener.kt
@@ -43,7 +43,7 @@ internal object ItemListener : Initializable(), Listener {
         registerPacketListener()
     }
 
-    @EventHandler(priority = EventPriority.LOW)
+    @EventHandler(priority = EventPriority.NORMAL)
     private fun handleInteract(e: WrappedPlayerInteractEvent) {
         val event = e.event
         val player = event.player
@@ -96,7 +96,7 @@ internal object ItemListener : Initializable(), Listener {
         findBehaviors(equippedItem)?.forEach { it.handleEquip(player, equippedItem!!, true, event) }
     }
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
     private fun handleInteract(event: InventoryClickEvent) {
         val player = event.whoClicked as Player
         val clickedItem = event.currentItem

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/interact/BlockInteracting.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/interact/BlockInteracting.kt
@@ -30,7 +30,7 @@ internal object BlockInteracting : Listener {
         registerEvents()
     }
 
-    @EventHandler(priority = EventPriority.NORMAL)
+    @EventHandler(priority = EventPriority.LOW)
     fun handleInteract(e: WrappedPlayerInteractEvent) {
         val event = e.event
         if (event.isCompletelyDenied())