From 13a89944c8937ce140523decdfffbccb1b218fd3 Mon Sep 17 00:00:00 2001 From: l4zs Date: Sun, 8 Aug 2021 20:46:36 +0200 Subject: [PATCH 1/5] fix some shift clicks not calling GUIClickEvent --- src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt index b8a7d281..4f505e06 100644 --- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt +++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt @@ -77,7 +77,7 @@ object GUIHolder : AutoCloseable { } private val InventoryAction.isGUIClick - get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF + get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE private val InventoryInteractEvent.playerOrCancel: Player? get() = (whoClicked as? Player) ?: kotlin.run { isCancelled = true From 4ea3d67643ab1a6a6f2385a7a3da09d25006f0cf Mon Sep 17 00:00:00 2001 From: l4zs Date: Sun, 8 Aug 2021 21:15:33 +0200 Subject: [PATCH 2/5] fix some shift clicks not calling GUIClickEvent --- src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt index 4f505e06..abd05d11 100644 --- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt +++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt @@ -77,7 +77,7 @@ object GUIHolder : AutoCloseable { } private val InventoryAction.isGUIClick - get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE + get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE || this == InventoryAction.MOVE_TO_OTHER_INVENTORY private val InventoryInteractEvent.playerOrCancel: Player? get() = (whoClicked as? Player) ?: kotlin.run { isCancelled = true From 37235278a7694e4400f3ed3f3203d284e54c4b80 Mon Sep 17 00:00:00 2001 From: l4zs Date: Sun, 8 Aug 2021 21:16:27 +0200 Subject: [PATCH 3/5] fix some shift clicks not calling GUIClickEvent --- src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt index abd05d11..68694a65 100644 --- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt +++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt @@ -77,7 +77,7 @@ object GUIHolder : AutoCloseable { } private val InventoryAction.isGUIClick - get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE || this == InventoryAction.MOVE_TO_OTHER_INVENTORY + get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.MOVE_TO_OTHER_INVENTORY private val InventoryInteractEvent.playerOrCancel: Player? get() = (whoClicked as? Player) ?: kotlin.run { isCancelled = true From d9b3d1d6e15459bf2ae4e8779634fc172478f191 Mon Sep 17 00:00:00 2001 From: l4zs Date: Sun, 8 Aug 2021 21:19:48 +0200 Subject: [PATCH 4/5] fix some shift clicks not calling GUIClickEvent --- src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt index 68694a65..abd05d11 100644 --- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt +++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt @@ -77,7 +77,7 @@ object GUIHolder : AutoCloseable { } private val InventoryAction.isGUIClick - get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.MOVE_TO_OTHER_INVENTORY + get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE || this == InventoryAction.MOVE_TO_OTHER_INVENTORY private val InventoryInteractEvent.playerOrCancel: Player? get() = (whoClicked as? Player) ?: kotlin.run { isCancelled = true From b2c90d424f06b815358f444f6c164a21cdd0a8a7 Mon Sep 17 00:00:00 2001 From: l4zs Date: Sun, 8 Aug 2021 21:37:20 +0200 Subject: [PATCH 5/5] add new line after extension value --- src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt index abd05d11..54c722ee 100644 --- a/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt +++ b/src/main/kotlin/net/axay/kspigot/gui/GUIHolder.kt @@ -78,6 +78,7 @@ object GUIHolder : AutoCloseable { private val InventoryAction.isGUIClick get() = this == InventoryAction.PICKUP_ALL || this == InventoryAction.PICKUP_HALF || this == InventoryAction.PICKUP_SOME || this == InventoryAction.PICKUP_ONE || this == InventoryAction.MOVE_TO_OTHER_INVENTORY + private val InventoryInteractEvent.playerOrCancel: Player? get() = (whoClicked as? Player) ?: kotlin.run { isCancelled = true