JarvisBigBalls
/
Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More Fixes

This commit is contained in:
Shaun Bennett 2015-12-15 14:45:12 -05:00
parent 607c164753
commit 07f610d4bd
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/.idea/dataSources.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DataSourceManagerImpl" format="xml" hash="2876127046"> <component name="DataSourceManagerImpl" format="xml" hash="1486084220">
<data-source source="LOCAL" name="Mineplex" uuid="14dfc55d-5343-47c4-ab24-76a055b8059e"> <data-source source="LOCAL" name="Mineplex" uuid="14dfc55d-5343-47c4-ab24-76a055b8059e">
<driver-ref>mysql</driver-ref> <driver-ref>mysql</driver-ref>
<synchronize>true</synchronize> <synchronize>true</synchronize>

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/types/HatGadget.java
View File

@ -19,7 +19,7 @@ public abstract class HatGadget extends OutfitGadget
public HatGadget(GadgetManager manager, String name, String[] desc, int cost, ItemStack item, String... altNames) 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; _hat = item;
ItemMeta im = _hat.getItemMeta(); ItemMeta im = _hat.getItemMeta();

9
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
View File

@ -480,12 +480,17 @@ public class RewardManager
} }
} }
possibleRewards.add(treasure); if (!isExcluded)
totalWeight += treasure.getWeight(); {
possibleRewards.add(treasure);
totalWeight += treasure.getWeight();
}
} }
if (possibleRewards.size() == 0) if (possibleRewards.size() == 0)
{ {
totalWeight = 0;
// go again, ignore excluded // go again, ignore excluded
for (Reward treasure : treasureList) for (Reward treasure : treasureList)
{ {