mirror of
https://github.com/Auxilor/EcoArmor.git
synced 2025-12-19 15:09:26 +00:00
Improved PR. TODO: Recode the whole plugin
This commit is contained in:
@@ -3,11 +3,15 @@ package com.willfp.ecoarmor
|
||||
import com.willfp.eco.core.command.impl.PluginCommand
|
||||
import com.willfp.eco.core.display.DisplayModule
|
||||
import com.willfp.eco.core.items.Items
|
||||
import com.willfp.ecoarmor.api.PlayerArmorSetEventListeners
|
||||
import com.willfp.ecoarmor.sets.PlayerArmorSetEventListeners
|
||||
import com.willfp.ecoarmor.commands.CommandEcoArmor
|
||||
import com.willfp.ecoarmor.display.ArmorDisplay
|
||||
import com.willfp.ecoarmor.libreforge.ConditionIsWearingSet
|
||||
import com.willfp.ecoarmor.sets.*
|
||||
import com.willfp.ecoarmor.sets.ArmorSetEquipSoundListeners
|
||||
import com.willfp.ecoarmor.sets.ArmorSets
|
||||
import com.willfp.ecoarmor.sets.ArmorUtils
|
||||
import com.willfp.ecoarmor.sets.EffectiveDurabilityListener
|
||||
import com.willfp.ecoarmor.sets.PreventSkullPlaceListener
|
||||
import com.willfp.ecoarmor.upgrades.AdvancementShardListener
|
||||
import com.willfp.ecoarmor.upgrades.CrystalListener
|
||||
import com.willfp.ecoarmor.upgrades.TierArgParser
|
||||
|
||||
@@ -4,8 +4,11 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.event.HandlerList
|
||||
|
||||
class PlayerArmorSetEquipEvent(who: Player, override val set: ArmorSet,
|
||||
override val advanced: Boolean): PlayerArmorSetEvent(who, set, advanced) {
|
||||
class PlayerArmorSetEquipEvent(
|
||||
who: Player,
|
||||
override val set: ArmorSet,
|
||||
override val advanced: Boolean
|
||||
) : PlayerArmorSetEvent(who, set, advanced) {
|
||||
override fun getHandlers(): HandlerList {
|
||||
return handlerList
|
||||
}
|
||||
|
||||
@@ -4,5 +4,8 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.event.player.PlayerEvent
|
||||
|
||||
abstract class PlayerArmorSetEvent(who: Player, override val set: ArmorSet,
|
||||
override val advanced: Boolean): PlayerEvent(who), ArmorSetEvent
|
||||
abstract class PlayerArmorSetEvent(
|
||||
who: Player,
|
||||
override val set: ArmorSet,
|
||||
override val advanced: Boolean
|
||||
) : PlayerEvent(who), ArmorSetEvent
|
||||
|
||||
@@ -4,8 +4,11 @@ import com.willfp.ecoarmor.sets.ArmorSet
|
||||
import org.bukkit.entity.Player
|
||||
import org.bukkit.event.HandlerList
|
||||
|
||||
class PlayerArmorSetUnequipEvent(who: Player, override val set: ArmorSet,
|
||||
override val advanced: Boolean): PlayerArmorSetEvent(who, set, advanced) {
|
||||
class PlayerArmorSetUnequipEvent(
|
||||
who: Player,
|
||||
override val set: ArmorSet,
|
||||
override val advanced: Boolean
|
||||
) : PlayerArmorSetEvent(who, set, advanced) {
|
||||
override fun getHandlers(): HandlerList {
|
||||
return handlerList
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.willfp.ecoarmor.api
|
||||
package com.willfp.ecoarmor.sets
|
||||
|
||||
import com.willfp.eco.core.events.ArmorChangeEvent
|
||||
import com.willfp.ecoarmor.api.event.PlayerArmorSetEquipEvent
|
||||
@@ -9,6 +9,7 @@ import org.bukkit.event.EventHandler
|
||||
import org.bukkit.event.Listener
|
||||
|
||||
class PlayerArmorSetEventListeners : Listener {
|
||||
// disgusting
|
||||
@EventHandler
|
||||
fun handle(event: ArmorChangeEvent) {
|
||||
val setBefore = ArmorUtils.getSetOn(event.before)
|
||||
@@ -16,7 +17,9 @@ class PlayerArmorSetEventListeners: Listener {
|
||||
val setAfter = ArmorUtils.getSetOn(event.after)
|
||||
val advancedAfter = ArmorUtils.isWearingAdvanced(event.after)
|
||||
|
||||
if (setBefore == setAfter && advancedBefore == advancedAfter) return
|
||||
if (setBefore == setAfter && advancedBefore == advancedAfter) {
|
||||
return
|
||||
}
|
||||
|
||||
if (setBefore != null) {
|
||||
Bukkit.getPluginManager().callEvent(
|
||||
Reference in New Issue
Block a user