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

Merge remote-tracking branch 'refs/remotes/origin/update/moba-cosmetics' into update/hub-makeover

Browse Source
This commit is contained in:
Sam 2017-09-09 09:20:08 +01:00
commit b3c216b7a8
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/gemhunters/GemHuntersMountType.java
View File

@ -89,6 +89,7 @@ public enum GemHuntersMountType
{
private DisguiseManager _disguise = Managers.get(DisguiseManager.class);
private int _tick;
@Override
public Horse spawn(Location location, DisguiseManager manager)
@ -116,12 +117,14 @@ public enum GemHuntersMountType
}
DisguiseSheep sheep = (DisguiseSheep) base;
int mod = horse.getTicksLived() % 40;
int mod = _tick++ % 4;
if (mod == 0) sheep.setColor(DyeColor.RED);
else if (mod == 1) sheep.setColor(DyeColor.YELLOW);
else if (mod == 2) sheep.setColor(DyeColor.GREEN);
else if (mod == 3) sheep.setColor(DyeColor.BLUE);
_disguise.updateDisguise(base);
}
},
ROYAL_STEED("Royal Steed Mount Skin", Material.GOLD_BARDING)

2
Plugins/Mineplex.StaffServer/src/mineplex/staffServer/salespackage/SalesPackageManager.java
View File

@ -193,7 +193,7 @@ public class SalesPackageManager extends MiniPlugin
}
else if (salesPackage instanceof MythicalChest || salesPackage instanceof AncientChest || salesPackage instanceof OldChest || salesPackage instanceof IlluminatedChest || salesPackage instanceof FreedomChest || salesPackage instanceof HauntedChest || salesPackage instanceof TrickOrTreatChest
|| salesPackage instanceof ThankfulChest || salesPackage instanceof GingerbreadChest || salesPackage instanceof MinestrikeChest || salesPackage instanceof LoveChest || salesPackage instanceof StPatricksChest
|| salesPackage instanceof SpringChest)
|| salesPackage instanceof SpringChest || salesPackage instanceof HOGChest)
{
chestBuilder = chestBuilder.extra("[").color("gray").extra(salesPackage.getName()).color("green").click("run_command", "/display " + playerName + " " + salesPackage.getName()).extra("] ").color("gray");
}