Skip to content

Commit dcfa602

Browse files
Fix issues regarding item stack comparision for vote chest claiming
1 parent 3adec2c commit dcfa602

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

src/main/kotlin/me/clip/voteparty/handler/PartyHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class PartyHandler(override val plugin: VotePartyPlugin) : Addon
140140

141141
fun buildCrate(amount: Int): ItemStack
142142
{
143-
val item = party.conf().getProperty(CrateSettings.MATERIAL).parseItem() ?: ItemStack(Material.CHEST, 1)
143+
val item = ItemStack(Material.CHEST, 1)
144144
item.amount = amount
145145

146146
return item.meta()

src/main/kotlin/me/clip/voteparty/listener/CrateListener.kt

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ package me.clip.voteparty.listener
22

33
import me.clip.voteparty.conf.sections.CrateSettings
44
import me.clip.voteparty.conf.sections.PartySettings
5+
import me.clip.voteparty.exte.meta
6+
import me.clip.voteparty.exte.name
57
import me.clip.voteparty.listener.base.VotePartyListener
68
import me.clip.voteparty.plugin.VotePartyPlugin
79
import org.bukkit.event.EventHandler
810
import org.bukkit.event.block.Action
911
import org.bukkit.event.player.PlayerInteractEvent
12+
import org.bukkit.inventory.meta.ItemMeta
1013

1114
internal class CrateListener(override val plugin: VotePartyPlugin) : VotePartyListener
1215
{
@@ -24,13 +27,26 @@ internal class CrateListener(override val plugin: VotePartyPlugin) : VotePartyLi
2427
return
2528
}
2629

27-
val held = player.inventory.itemInHand
30+
val held = player.inventory.itemInMainHand
2831
val item = party.partyHandler.buildCrate(1)
29-
30-
if (!held.isSimilar(item))
32+
33+
34+
if (held.type != item.type) {
35+
return
36+
}
37+
38+
val heldMeta: ItemMeta? = held.itemMeta
39+
val itemMeta: ItemMeta? = item.itemMeta
40+
41+
//if (!held.isSimilar(item))
42+
if (heldMeta == null || itemMeta == null)
3143
{
3244
return
3345
}
46+
47+
if (heldMeta.name != itemMeta.name || heldMeta.lore != itemMeta.lore) {
48+
return
49+
}
3450

3551
if (player.world.name in party.conf().getProperty(PartySettings.DISABLED_WORLDS))
3652
{

0 commit comments

Comments
 (0)