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

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

Browse Source
This commit is contained in:
xGamingDudex 2016-05-16 01:34:08 +02:00
commit 4ebf48bd45
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/GadgetPage.java
View File

@ -194,8 +194,7 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
}
else
{
String gadgetName = (gadget.GetName().startsWith("Piñata")) ? gadget.GetName().replace("ñ", "n") : gadget.GetName();
addButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), gadgetName, itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new ActivateGadgetButton(gadget, this));
addButton(slot, new ShopItem(gadget.GetDisplayMaterial(), gadget.GetDisplayData(), gadget.GetName(), itemLore.toArray(new String[itemLore.size()]), 1, true, false).hideInfo(), new ActivateGadgetButton(gadget, this));
}
return;

4
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/death/DeathPinataBurst.java
View File

@ -19,9 +19,9 @@ public class DeathPinataBurst extends DeathEffectGadget
public DeathPinataBurst(GadgetManager manager)
{
super(manager, "Piñata Burst",
super(manager, "Pinata Burst",
UtilText.splitLineToArray(C.cGray + "Kill 'em with kindness and " + C.cPurple + "candy!", LineFormat.LORE),
-2, Material.FIREWORK, (byte)0, "Pinata Burst");
-2, Material.FIREWORK, (byte)0);
}
@Override

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

@ -24,7 +24,7 @@ public abstract class Gadget extends SalesPackageBase implements Listener
private GadgetType _gadgetType;
protected HashSet<Player> _active = new HashSet<Player>();
protected HashSet<Player> _active = new HashSet<>();
protected GadgetSet _set = null;