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

Merge branch 'project-cosmetics' of github.com:Mineplex-LLC/Minecraft-PC into project-cosmetics

This commit is contained in:
LCastr0 2016-10-03 22:44:24 -03:00
parent fb29947705 d00c887a84
commit 515fd9fb70
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/bonuses/gui/buttons/PowerPlayClubButton.java
View File

@ -123,9 +123,6 @@ public class PowerPlayClubButton implements GuiItem
lore = buildLore(Collections.singletonList(YearMonth.now())); lore = buildLore(Collections.singletonList(YearMonth.now()));
lore.add(" "); lore.add(" ");
lore.add(C.cGreen + "First-time Bonus:");
lore.add(" " + C.cWhite + "Metal Man Morph");
lore.add(" ");
lore.add(C.cRed + "Get Power Play Club months at"); lore.add(C.cRed + "Get Power Play Club months at");
lore.add(C.cAqua + "mineplex.com/shop"); lore.add(C.cAqua + "mineplex.com/shop");
} }

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

@ -344,7 +344,7 @@ public class GadgetManager extends MiniPlugin
addGadget(new MorphUncleSam(this)); addGadget(new MorphUncleSam(this));
addGadget(new MorphSquid(this)); addGadget(new MorphSquid(this));
addGadget(new MorphWitch(this)); addGadget(new MorphWitch(this));
addGadget(new MorphMetalMan(this)); //addGadget(new MorphMetalMan(this)); // Soon: reward for signup
// Particles // Particles
addGadget(new ParticleFoot(this)); addGadget(new ParticleFoot(this));

5
Plugins/Mineplex.Core/src/mineplex/core/powerplayclub/PowerPlayClubRewards.java
View File

@ -73,11 +73,6 @@ public class PowerPlayClubRewards
List<PowerPlayClubItem> items = rewardsForMonths(cached.getUnclaimedMonths()); List<PowerPlayClubItem> items = rewardsForMonths(cached.getUnclaimedMonths());
// Give Metal Man morph for signing up
donationManager.PurchaseUnknownSalesPackage(null, player.getName(),
donationManager.getClientManager().Get(player).getAccountId(), "Metal Man Morph",
GlobalCurrency.TREASURE_SHARD, 0, true);
// Give normal power play items // Give normal power play items
items.forEach(item -> items.forEach(item ->
{ {