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

PR comments

This commit is contained in:
Sam 2017-10-17 00:32:53 +01:00 committed by Alexander Meech
parent 458bb6e1c6
commit a8d820599a
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java
View File

@ -41,6 +41,6 @@ public class UnknownPackageReward extends Reward
@Override
public boolean canGiveReward(Player player)
{
return !DONATION_MANAGER.Get(player).ownsUnknownSalesPackage(_packageName);
return !DONATION_MANAGER.Get(player).ownsUnknownSalesPackage(_packageName) || INVENTORY_MANAGER.Get(player).getItemCount(_packageName) > 0;
}
}

8
Plugins/Mineplex.Core/src/mineplex/core/treasure/types/SpringTreasure.java
View File

@ -1,12 +1,10 @@
package mineplex.core.treasure.types;
import mineplex.core.gadget.gadgets.arrowtrail.ArrowTrailSpring;
import mineplex.core.gadget.gadgets.death.DeathPresentDanger;
import mineplex.core.gadget.gadgets.death.DeathSpring;
import mineplex.core.gadget.gadgets.doublejump.DoubleJumpSpring;
import mineplex.core.gadget.gadgets.morph.MorphAwkwardRabbit;
import mineplex.core.gadget.gadgets.particle.spring.ParticleSpringHalo;
import mineplex.core.gadget.gadgets.wineffect.WinEffectWinterWarfare;
import mineplex.core.pet.PetType;
import mineplex.core.reward.RewardType;
import mineplex.core.treasure.animation.animations.SpringChestAnimation;
@ -35,9 +33,9 @@ public class SpringTreasure extends Treasure
@Override
protected void addLegendary(RewardRarity rarity)
{
addGadgetReward(getGadget(DeathPresentDanger.class), rarity, 25);
addGadgetReward(getGadget(WinEffectWinterWarfare.class), rarity, 25);
addPetReward(PetType.GINGERBREAD_MAN, rarity, 10);
addGadgetReward(getGadget(ParticleSpringHalo.class), rarity, 100);
addGadgetReward(getGadget(MorphAwkwardRabbit.class), rarity, 25);
addPetReward(PetType.KILLER_BUNNY, rarity, 10);
}
@Override

1
Plugins/Mineplex.Core/src/mineplex/core/treasure/ui/TreasurePage.java
View File

@ -101,6 +101,7 @@ public class TreasurePage extends ShopPageBase<TreasureManager, TreasureShop>
lore.addAll(treasure.getPurchaseMethods());
}
// TODO Remove this. Only re-implement if ownership bugs within rewards can be fixed
// if (!treasure.isDuplicates())
// {
// TreasureRewardManager rewardManager = _treasureLocation.getManager().getRewardManager();