Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
group=me.arasple.mc.trmenu
version=3.8.8
version=3.8.9
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ 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
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

Expand Down Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,7 +22,7 @@ abstract class HookAbstract {
return null
}

val plugin: Plugin? by lazy {
val plugin: Plugin? by unsafeLazy {
Bukkit.getPluginManager().getPlugin(name)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down