diff --git a/gradle.properties b/gradle.properties index 1c13b039..e674454f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=me.arasple.mc.trmenu -version=3.8.8 \ No newline at end of file +version=3.8.9 \ No newline at end of file diff --git a/plugin/src/main/kotlin/trplugins/menu/module/internal/command/impl/CommandItem.kt b/plugin/src/main/kotlin/trplugins/menu/module/internal/command/impl/CommandItem.kt index 9fc9213f..2688064e 100644 --- a/plugin/src/main/kotlin/trplugins/menu/module/internal/command/impl/CommandItem.kt +++ b/plugin/src/main/kotlin/trplugins/menu/module/internal/command/impl/CommandItem.kt @@ -12,6 +12,7 @@ import taboolib.common.platform.function.submit import taboolib.library.xseries.XSound import taboolib.module.configuration.Configuration import taboolib.module.configuration.Type +import taboolib.module.nms.MinecraftVersion import taboolib.module.nms.getItemTag import taboolib.module.nms.getName import taboolib.platform.util.isAir @@ -19,7 +20,6 @@ import taboolib.platform.util.sendLang import taboolib.type.BukkitEquipment import trplugins.menu.module.internal.command.CommandExpression import trplugins.menu.module.internal.hook.HookPlugin -import trplugins.menu.module.internal.hook.impl.HookNBTAPI import trplugins.menu.module.internal.item.ItemRepository import trplugins.menu.util.bukkit.ItemHelper @@ -101,7 +101,7 @@ object CommandItem : CommandExpression { val stringJson: String = if (!HookPlugin.getNBTAPI().isHooked) { val json = JsonObject() json.addProperty("type", item.type.name) - json.addProperty("data", item.data!!.data) + json.addProperty("data", if (MinecraftVersion.isLowerOrEqual(MinecraftVersion.V1_12)) item.data!!.data else 0) json.addProperty("amount", item.amount) json.add("meta", Gson().toJsonTree(item.getItemTag())) json.toString() diff --git a/plugin/src/main/kotlin/trplugins/menu/module/internal/hook/HookAbstract.kt b/plugin/src/main/kotlin/trplugins/menu/module/internal/hook/HookAbstract.kt index 2508255e..a71e21ad 100644 --- a/plugin/src/main/kotlin/trplugins/menu/module/internal/hook/HookAbstract.kt +++ b/plugin/src/main/kotlin/trplugins/menu/module/internal/hook/HookAbstract.kt @@ -3,6 +3,7 @@ package trplugins.menu.module.internal.hook import org.bukkit.Bukkit import org.bukkit.plugin.Plugin import taboolib.common.platform.function.console +import taboolib.common.util.unsafeLazy import taboolib.module.lang.sendLang import trplugins.menu.module.internal.script.Bindings import trplugins.menu.module.internal.script.jexl.JexlAgent @@ -21,7 +22,7 @@ abstract class HookAbstract { return null } - val plugin: Plugin? by lazy { + val plugin: Plugin? by unsafeLazy { Bukkit.getPluginManager().getPlugin(name) } diff --git a/plugin/src/main/kotlin/trplugins/menu/module/internal/listener/ListenerItemInteract.kt b/plugin/src/main/kotlin/trplugins/menu/module/internal/listener/ListenerItemInteract.kt index b85c68c4..58791a5f 100644 --- a/plugin/src/main/kotlin/trplugins/menu/module/internal/listener/ListenerItemInteract.kt +++ b/plugin/src/main/kotlin/trplugins/menu/module/internal/listener/ListenerItemInteract.kt @@ -28,7 +28,7 @@ object ListenerItemInteract { Baffle.of(TrMenu.SETTINGS.getLong("Menu.Settings.Bound-Item-Interval", 2000), TimeUnit.MILLISECONDS) } - @SubscribeEvent(priority = EventPriority.HIGHEST, ignoreCancelled = true) + @SubscribeEvent(priority = EventPriority.HIGHEST) fun onInteract(e: PlayerInteractEvent) { ListenerItemInteract::interactCooldown.get()