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

Added message if blow a kiss doesn't hit anyone

Browse Source 
Changed the lore for the taunt
Changed the display item and lore for the love chest
This commit is contained in:
LCastr0 2017-02-08 15:17:04 -02:00
parent 5dcf028a37
commit 5902e82d58
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/taunts/BlowAKissTaunt.java
View File

@ -25,7 +25,7 @@ public class BlowAKissTaunt extends TauntGadget
public BlowAKissTaunt(GadgetManager manager)
{
super(manager, "Blow A Kiss", UtilText.splitLinesToArray(new String[]{
C.cWhite + "Use /taunt in game to blow a kiss at your enemies.",
C.cWhite + "Type /taunt in game to blow a kiss at your enemies.",
C.cRed + "Cannot be used while in PvP!"}, LineFormat.LORE),
-17, Material.GLASS, (byte) 0);
setDisplayItem(ItemStackFactory.Instance.createCustomPotion(PotionType.INSTANT_HEAL));

9
Plugins/Mineplex.Core/src/mineplex/core/particleeffects/BlowAKissEffect.java
View File

@ -20,7 +20,6 @@ public class BlowAKissEffect extends Effect
private Location _fixedLoc;
private Gadget _gadget;
private Player _player;
private boolean _forceStop = false;
public BlowAKissEffect(Player player, Location target, Gadget gadget)
{
@ -58,13 +57,9 @@ public class BlowAKissEffect extends Effect
stop();
return;
}
if (_fixedLoc.getBlock().getType() != Material.AIR )
if (_fixedLoc.getBlock().getType() != Material.AIR || _count >= 1000)
{
stop();
}
else if (_count >= 1000)
{
_forceStop = true;
UtilServer.broadcast(F.main("Blow A Kiss", F.name(_player.getName()) + " wanted to kiss someone but no one was around!"));
stop();
}
_count += 5;

4
Plugins/Mineplex.Core/src/mineplex/core/treasure/gui/TreasurePage.java
View File

@ -387,7 +387,7 @@ public class TreasurePage extends ShopPageBase<TreasureManager, TreasureShop>
lovechestLore.add(" ");
lovechestLore.add(F.value("Love Chests Owned", "" + loveCount));
lovechestLore.add(" ");
lovechestLore.addAll(UtilText.splitLines(new String[]{"Placeholder"}, LineFormat.LORE));
lovechestLore.addAll(UtilText.splitLines(new String[]{"Cupid and his hunters have searched far and wide to collect a whole bunch of lovey dovey items. 6 items, no duplicates."}, LineFormat.LORE));
lovechestLore.add(" ");
if (loveCount > 0)
{
@ -424,7 +424,7 @@ public class TreasurePage extends ShopPageBase<TreasureManager, TreasureShop>
ItemStack trick = new ShopItem(Material.SKULL_ITEM, C.cGoldB + "Trick or Treat Treasure", trickLore.toArray(new String[0]), 0, false, false);
ItemStack thank = new ShopItem(Material.COOKED_CHICKEN, C.cGoldB + "Thankful Treasure", thankLore.toArray(new String[0]), 0, false, false);
ItemStack gingerbread = SkinData.GINGERBREAD.getSkull(C.cRedB + "Gingerbread" + C.cGreenB + " Treasure", gingerbreadLore);
ItemStack lovechest = SkinData.LOVESTRUCK.getSkull(C.cRedB + "Love Treasure", lovechestLore);
ItemStack lovechest = new ShopItem(Material.WOOL, (byte) 6, C.cRedB + "Love Chest", lovechestLore.toArray(new String[0]), 0, false, false);
// Adds shard item
addItem(49, shards);