From a8d820599a56b45161a568046c38a4bdaaa5d20a Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 17 Oct 2017 00:32:53 +0100 Subject: [PATCH] PR comments --- .../core/reward/rewards/UnknownPackageReward.java | 2 +- .../src/mineplex/core/treasure/types/SpringTreasure.java | 8 +++----- .../src/mineplex/core/treasure/ui/TreasurePage.java | 1 + 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java index 8cdce18a0..74590328a 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/UnknownPackageReward.java @@ -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; } } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/SpringTreasure.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/SpringTreasure.java index b9f632261..368801c32 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/SpringTreasure.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/types/SpringTreasure.java @@ -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 diff --git a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ui/TreasurePage.java b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ui/TreasurePage.java index c20958475..fe904c036 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/treasure/ui/TreasurePage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/treasure/ui/TreasurePage.java @@ -101,6 +101,7 @@ public class TreasurePage extends ShopPageBase 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();