Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-22 04:37:42 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Kilos fix on gem stone dupe

Browse Source
This commit is contained in:
Indyuce 2022-11-07 17:24:31 +01:00
parent 23df2dfe2d
commit ecf8fda224
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MMOItems-API/src/main/java/net/Indyuce/mmoitems/api/interaction/GemStone.java
View File

@ -2,7 +2,6 @@ package net.Indyuce.mmoitems.api.interaction;
import io.lumine.mythic.lib.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import net.Indyuce.mmoitems.ItemStats; import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.util.MMOUtils;
import net.Indyuce.mmoitems.api.Type; import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.event.item.ApplyGemStoneEvent; import net.Indyuce.mmoitems.api.event.item.ApplyGemStoneEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.LiveMMOItem; import net.Indyuce.mmoitems.api.item.mmoitem.LiveMMOItem;
@ -17,6 +16,7 @@ import net.Indyuce.mmoitems.stat.data.type.StatData;
import net.Indyuce.mmoitems.stat.type.GemStoneStat; import net.Indyuce.mmoitems.stat.type.GemStoneStat;
import net.Indyuce.mmoitems.stat.type.ItemStat; import net.Indyuce.mmoitems.stat.type.ItemStat;
import net.Indyuce.mmoitems.stat.type.StatHistory; import net.Indyuce.mmoitems.stat.type.StatHistory;
import net.Indyuce.mmoitems.util.MMOUtils;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Sound; import org.bukkit.Sound;
@ -127,15 +127,13 @@ public class GemStone extends UseItem {
// Get that gem // Get that gem
GemSocketsData registeredGemData = (GemSocketsData) gemStory.getModifiersBonus(uid); GemSocketsData registeredGemData = (GemSocketsData) gemStory.getModifiersBonus(uid);
if (registeredGemData != null) { if (registeredGemData != null && registeredGemData.getEmptySocket(gemType) != null) {
if (registeredGemData.getEmptySocket(gemType) != null) {
//UPGRD//MMOItems.log("\u00a77Applied Gemstone @\u00a76Gemstone\u00a77: \u00a73" + foundSocketColor); //UPGRD//MMOItems.log("\u00a77Applied Gemstone @\u00a76Gemstone\u00a77: \u00a73" + foundSocketColor);
// Charmer // Charmer
success = true; success = true;
registeredGemData.apply(gemType, gemData); registeredGemData.apply(gemType, gemData);
} break;
} }
} }
@ -145,11 +143,7 @@ public class GemStone extends UseItem {
// Get that gem // Get that gem
GemSocketsData registeredGemData = (GemSocketsData) extraneousGem; GemSocketsData registeredGemData = (GemSocketsData) extraneousGem;
if (registeredGemData == null) { if (registeredGemData != null && registeredGemData.getEmptySocket(gemType) != null) {
continue;
}
if (registeredGemData.getEmptySocket(gemType) != null) {
//UPGRD//MMOItems.log("\u00a77Applied Gemstone @\u00a76External\u00a77: \u00a73" + foundSocketColor); //UPGRD//MMOItems.log("\u00a77Applied Gemstone @\u00a76External\u00a77: \u00a73" + foundSocketColor);
// Charmer // Charmer