diff --git a/Plugins/.idea/dataSources.xml b/Plugins/.idea/dataSources.xml index dea8a489b..3aa4d521d 100644 --- a/Plugins/.idea/dataSources.xml +++ b/Plugins/.idea/dataSources.xml @@ -1,6 +1,6 @@ - + mysql true diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java index b9081c975..d61339bf8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java @@ -19,7 +19,7 @@ public abstract class HatGadget extends OutfitGadget public HatGadget(GadgetManager manager, String name, String[] desc, int cost, ItemStack item, String... altNames) { - super(manager, name, desc, cost, ArmorSlot.Helmet, item.getType(), item.getData().getData()); + super(manager, name, desc, cost, ArmorSlot.Helmet, item.getType(), item.getData().getData(), altNames); _hat = item; ItemMeta im = _hat.getItemMeta(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java index 78342b4f3..78dda6d16 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java @@ -480,12 +480,17 @@ public class RewardManager } } - possibleRewards.add(treasure); - totalWeight += treasure.getWeight(); + if (!isExcluded) + { + possibleRewards.add(treasure); + totalWeight += treasure.getWeight(); + } } if (possibleRewards.size() == 0) { + totalWeight = 0; + // go again, ignore excluded for (Reward treasure : treasureList) {