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

Merge branch 'master' of ssh://184.154.0.242:7999/min/Mineplex

Browse Source
This commit is contained in:
Jonathan Williams 2014-12-15 21:30:20 -05:00
commit 0cb5939794
3 changed files with 72 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseWither.java
View File

@ -34,4 +34,10 @@ public class DisguiseWither extends DisguiseMonster
{
DataWatcher.watch(17 + i, Integer.valueOf(j));
}
public void setBossbarData(String text, double health)
{
// TODO Auto-generated method stub
}
}

11
Plugins/Mineplex.Core/src/mineplex/core/mount/HorseMount.java
View File

@ -107,15 +107,8 @@ public class HorseMount extends Mount<Horse>
if (_armor != null)
horse.getInventory().setArmor(new ItemStack(_armor));
if (player.getName().equals("Phinary"))
{
horse.setCustomName("Dinnerbone");
}
else
{
horse.setCustomName(player.getName() + "'s " + GetName());
horse.setCustomNameVisible(true);
}
horse.setCustomName(player.getName() + "'s " + GetName());
//Inform
UtilPlayer.message(player, F.main("Mount", "You spawned " + F.elem(GetName()) + "."));

114
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java
View File

@ -1,67 +1,71 @@
package nautilus.game.arcade;
import org.bukkit.Material;
public enum GameType
{
//Mini
BaconBrawl("Bacon Brawl"),
Barbarians("A Barbarians Life"),
Bridge("The Bridges"),
CastleSiege("Castle Siege"),
ChampionsTDM("Champions TDM", "Champions"),
ChampionsDominate("Champions Domination", "Champions"),
ChampionsMOBA("Champions MOBA", "Champions"),
Christmas("Christmas Chaos"),
DeathTag("Death Tag"),
DragonEscape("Dragon Escape"),
DragonEscapeTeams("Dragon Escape Teams"),
DragonRiders("Dragon Riders"),
Dragons("Dragons"),
DragonsTeams("Dragons Teams"),
Draw("Draw My Thing"),
Evolution("Evolution"),
FlappyBird("Flappy Bird"),
Gravity("Gravity"),
Halloween("Halloween Horror"),
HideSeek("Block Hunt"),
Horse("Horseback"),
SurvivalGames("Survival Games"),
SurvivalGamesTeams("Survival Games Teams"),
Micro("Micro Battle"),
MineStrike("MineStrike"),
MineWare("MineWare"),
MilkCow("Milk the Cow"),
Paintball("Super Paintball"),
Quiver("One in the Quiver"),
QuiverTeams("One in the Quiver Teams"),
Runner("Runner"),
SearchAndDestroy("Search and Destroy"),
Sheep("Sheep Quest"),
Smash("Super Smash Mobs"),
SmashTeams("Super Smash Mobs Teams", "Super Smash Mobs"),
SmashDomination("Super Smash Mobs Domination", "Super Smash Mobs"),
Snake("Snake"),
SneakyAssassins("Sneaky Assassins"),
SnowFight("Snow Fight"),
Spleef("Super Spleef"),
SpleefTeams("Super Spleef Teams"),
Stacker("Super Stacker"),
SquidShooter("Squid Shooter"),
Tug("Tug of Wool"),
TurfWars("Turf Wars"),
UHC("Ultra Hardcore"),
WitherAssault("Wither Assault"),
ZombieSurvival("Zombie Survival");
BaconBrawl("Bacon Brawl", Material.PORK, (byte)0),
Barbarians("A Barbarians Life", Material.WOOD_AXE, (byte)0),
Bridge("The Bridges", Material.IRON_PICKAXE, (byte)0),
CastleSiege("Castle Siege", Material.DIAMOND_CHESTPLATE, (byte)0),
ChampionsTDM("Champions TDM", "Champions", Material.GOLD_SWORD, (byte)0),
ChampionsDominate("Champions Domination", "Champions", Material.BEACON, (byte)0),
ChampionsMOBA("Champions MOBA", "Champions", Material.SKULL_ITEM, (byte)0),
Christmas("Christmas Chaos", Material.SNOW_BALL, (byte)0),
DeathTag("Death Tag", Material.SKULL, (byte)0),
DragonEscape("Dragon Escape", Material.DRAGON_EGG, (byte)0),
DragonEscapeTeams("Dragon Escape Teams", Material.DRAGON_EGG, (byte)0),
DragonRiders("Dragon Riders", Material.DRAGON_EGG, (byte)0),
Dragons("Dragons", Material.ENDER_STONE, (byte)0),
DragonsTeams("Dragons Teams", Material.ENDER_STONE, (byte)0),
Draw("Draw My Thing", Material.BOOK_AND_QUILL, (byte)0),
Evolution("Evolution", Material.EMERALD, (byte)0),
FlappyBird("Flappy Bird", Material.FEATHER, (byte)0),
Gravity("Gravity", Material.ENDER_PORTAL, (byte)0),
Halloween("Halloween Horror", Material.PUMPKIN, (byte)0),
HideSeek("Block Hunt", Material.GRASS, (byte)0),
Horse("Horseback", Material.IRON_BARDING, (byte)0),
SurvivalGames("Survival Games", Material.IRON_SWORD, (byte)0),
SurvivalGamesTeams("Survival Games Teams", Material.IRON_SWORD, (byte)0),
Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0),
MineStrike("MineStrike", Material.TNT, (byte)0),
MineWare("MineWare", Material.PAPER, (byte)0),
MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0),
Paintball("Super Paintball", Material.ENDER_PEARL, (byte)0),
Quiver("One in the Quiver", Material.ARROW, (byte)0),
QuiverTeams("One in the Quiver Teams", Material.ARROW, (byte)0),
Runner("Runner", Material.LEATHER_BOOTS, (byte)0),
SearchAndDestroy("Search and Destroy", Material.TNT, (byte)0),
Sheep("Sheep Quest", Material.WOOL, (byte)4),
Smash("Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
SmashTeams("Super Smash Mobs Teams", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
SmashDomination("Super Smash Mobs Domination", "Super Smash Mobs", Material.SKULL_ITEM, (byte)4),
Snake("Snake", Material.WOOL, (byte)0),
SneakyAssassins("Sneaky Assassins", Material.INK_SACK, (byte)0),
SnowFight("Snow Fight", Material.SNOW_BALL, (byte)0),
Spleef("Super Spleef", Material.IRON_SPADE, (byte)0),
SpleefTeams("Super Spleef Teams", Material.IRON_SPADE, (byte)0),
Stacker("Super Stacker", Material.BOWL, (byte)0),
SquidShooter("Squid Shooter", Material.FIREWORK_CHARGE, (byte)0),
Tug("Tug of Wool", Material.WHEAT, (byte)0),
TurfWars("Turf Wars", Material.STAINED_CLAY, (byte)14),
UHC("Ultra Hardcore", Material.GOLDEN_APPLE, (byte)0),
WitherAssault("Wither Assault", Material.SKULL_ITEM, (byte)1),
ZombieSurvival("Zombie Survival", Material.SKULL_ITEM, (byte)2);
String _name;
String _lobbyName;
Material _mat;
byte _data;
GameType(String name)
GameType(String name, Material mat, byte data)
{
_name = name;
_lobbyName = name;
}
GameType(String name, String lobbyName)
GameType(String name, String lobbyName, Material mat, byte data)
{
_name = name;
_lobbyName = lobbyName;
@ -76,4 +80,14 @@ public enum GameType
{
return _lobbyName;
}
public Material GetMaterial()
{
return _mat;
}
public byte GetMaterialData()
{
return _data;
}
}