diff --git a/.gitignore b/.gitignore index 423f122..e3fdac0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /.gradle/ *.jar +!/libs/*.jar !gradle-wrapper.jar diff --git a/build.gradle.kts b/build.gradle.kts index cafe112..88f5ef6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,6 +22,7 @@ dependencies { implementation(kotlin("stdlib-jdk8")) implementation(kotlin("reflect")) implementation("commons-codec:commons-codec:1.14") + compileOnly(files("./libs/ArmorEquipEvent-1.7.2.jar")) compileOnly("com.comphenix.protocol", "ProtocolLib", "4.5.0") compileOnly("org.spigotmc", "spigot-api", "1.15.2-R0.1-SNAPSHOT") } diff --git a/libs/ArmorEquipEvent-1.7.2.jar b/libs/ArmorEquipEvent-1.7.2.jar new file mode 100644 index 0000000..66c9b0d Binary files /dev/null and b/libs/ArmorEquipEvent-1.7.2.jar differ diff --git a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt index d744acc..c85bd66 100644 --- a/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt +++ b/src/main/kotlin/de/moritzruth/spigot_ttt/game/items/ItemManager.kt @@ -1,5 +1,6 @@ package de.moritzruth.spigot_ttt.game.items +import com.codingforcookies.armorequip.ArmorEquipEvent import de.moritzruth.spigot_ttt.game.GameListener import de.moritzruth.spigot_ttt.game.GameManager import de.moritzruth.spigot_ttt.game.items.impl.* @@ -14,6 +15,7 @@ import de.moritzruth.spigot_ttt.utils.isLeftClick import de.moritzruth.spigot_ttt.utils.isRightClick import de.moritzruth.spigot_ttt.utils.nextTick import de.moritzruth.spigot_ttt.utils.sendActionBarMessage +import org.bukkit.GameMode import org.bukkit.Location import org.bukkit.Material import org.bukkit.entity.Item @@ -85,6 +87,11 @@ object ItemManager { } } + @EventHandler + fun onArmorEquip(event: ArmorEquipEvent) { + if (event.player.gameMode != GameMode.CREATIVE) event.isCancelled = true + } + @EventHandler(ignoreCancelled = true) fun onPlayerInteract(event: PlayerInteractEvent) = handle(event) { tttPlayer -> if (tttPlayer.ignoreNextInteract) { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 349e602..31aa46a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -5,6 +5,7 @@ api-version: "1.15" main: de.moritzruth.spigot_ttt.TTTPlugin depend: - ProtocolLib + - ArmorEquipEvent commands: voting: