McScrims-Network/GameModes-SpeedHG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix kit items being thrown away instead of using them

Browse Source
This commit is contained in:
TDSTOS
2026-04-17 03:33:13 +02:00
parent 95e366c365
commit f30108ca1d
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/kotlin/club/mcscrims/speedhg/kit/listener/KitEventDispatcher.kt
View File

@@ -174,11 +174,18 @@ class KitEventDispatcher(
val itemInHand = player.inventory.itemInMainHand val itemInHand = player.inventory.itemInMainHand
val active = kit.getActiveAbility( playstyle ) val active = kit.getActiveAbility( playstyle )
// Allow throwable items (potions, ender pearls, etc.) to pass through,
// UNLESS the item is the player's own kit item.
val isKitAbilityItem = kit.cachedItems[ player.uniqueId ]
?.any { it.isSimilar( itemInHand ) } == true
// Allow throwable items (potions, ender pearls, etc.) to pass through // Allow throwable items (potions, ender pearls, etc.) to pass through
if ( itemInHand.type == Material.SPLASH_POTION || if ( !isKitAbilityItem && (
itemInHand.type == Material.LINGERING_POTION || itemInHand.type == Material.SPLASH_POTION ||
itemInHand.type == Material.MILK_BUCKET || itemInHand.type == Material.LINGERING_POTION ||
itemInHand.type == Material.ENDER_PEARL ) return itemInHand.type == Material.MILK_BUCKET ||
itemInHand.type == Material.ENDER_PEARL
)) return
if ( itemInHand.type != active.triggerMaterial ) return if ( itemInHand.type != active.triggerMaterial ) return