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

Fixed illuminated chests having gadgets

Browse Source
This commit is contained in:
LCastr0 2016-12-08 20:55:04 -02:00 committed by cnr
parent b7e738b4e8
commit 77a1b40bef
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,10 +236,10 @@ public class RewardManager
addInventoryReward(Type.VALENTINES_GIFT, getGadget(ItemBow.class), rarity, 300, 0, 1, 5); addInventoryReward(Type.VALENTINES_GIFT, getGadget(ItemBow.class), rarity, 300, 0, 1, 5);
// INFUSED CHESTS // INFUSED CHESTS
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemCoal.class), rarity, 30, 0, 50, 100); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemCoal.class), rarity, 30, 0, 50, 100);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemFreezeCannon.class), rarity, 45, 0, 5, 10); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemFreezeCannon.class), rarity, 45, 0, 5, 10);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemPartyPopper.class), rarity, 60, 0, 5, 10); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemPartyPopper.class), rarity, 60, 0, 5, 10);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemSnowball.class), rarity, 60, 0, 5, 10); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemSnowball.class), rarity, 60, 0, 5, 10);
} }
public void addUncommon() public void addUncommon()
@ -312,10 +312,10 @@ public class RewardManager
addHat(Type.INFUSED_CHESTS, HatType.PRESENT, rarity, 40, 100); addHat(Type.INFUSED_CHESTS, HatType.PRESENT, rarity, 40, 100);
addHat(Type.INFUSED_CHESTS, HatType.SNOWMAN, rarity, 38, 100); addHat(Type.INFUSED_CHESTS, HatType.SNOWMAN, rarity, 38, 100);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemCoal.class), rarity, 33, 0, 65, 200); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemCoal.class), rarity, 33, 0, 65, 200);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemFreezeCannon.class), rarity, 45, 0, 25, 40); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemFreezeCannon.class), rarity, 45, 0, 25, 40);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemPartyPopper.class), rarity, 60, 0, 25, 40); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemPartyPopper.class), rarity, 60, 0, 25, 40);
addInventoryReward(Type.INFUSED_CHESTS, getGadget(ItemSnowball.class), rarity, 60, 0, 25, 40); addInventoryReward(Type.INFUSED_GADGETS, getGadget(ItemSnowball.class), rarity, 60, 0, 25, 40);
} }
public void addRare() public void addRare()
@ -891,12 +891,13 @@ public class RewardManager
_rewardPools.get(Type.ILLUMINATED).add(reward); _rewardPools.get(Type.ILLUMINATED).add(reward);
} }
} }
if (pool != Type.INFUSED_CHESTS) if (pool != Type.INFUSED_CHESTS && pool != Type.INFUSED_GADGETS)
{ {
_rewardPools.get(pool).add(reward); _rewardPools.get(pool).add(reward);
} }
else else
{ {
if (pool != Type.INFUSED_GADGETS)
_rewardPools.get(Type.ILLUMINATED).add(reward); _rewardPools.get(Type.ILLUMINATED).add(reward);
_rewardPools.get(Type.MYTHICAL).add(reward); _rewardPools.get(Type.MYTHICAL).add(reward);
} }

1
Plugins/Mineplex.Core/src/mineplex/core/reward/RewardPool.java
View File

@ -59,6 +59,7 @@ public class RewardPool
HAUNTED(false), HAUNTED(false),
TRICK_OR_TREAT(false), TRICK_OR_TREAT(false),
INFUSED_CHESTS(false), INFUSED_CHESTS(false),
INFUSED_GADGETS(true),
MYTHICAL(true), MYTHICAL(true),
THANKFUL(false), THANKFUL(false),
GINGERBREAD(false), GINGERBREAD(false),