Added 1.8 hooks for disguise setName and getName

Refactored method names in some disguise classes.
This commit is contained in:
Jonathan Williams 2014-12-15 21:46:14 -05:00
parent 0cb5939794
commit c43ee95c55
61 changed files with 160 additions and 152 deletions

View File

@ -18,14 +18,16 @@ public abstract class DisguiseInsentient extends DisguiseLiving
DataWatcher.a(11, Byte.valueOf((byte)0));
DataWatcher.a(10, "");
DataWatcher.a(3, Byte.valueOf((byte) 0));
DataWatcher.a(2, "");
}
public void SetName(String name)
public void setName(String name)
{
SetName(name, null);
setName(name, null);
}
public void SetName(String name, Rank rank)
public void setName(String name, Rank rank)
{
if (rank != null)
{
@ -36,20 +38,22 @@ public abstract class DisguiseInsentient extends DisguiseLiving
}
DataWatcher.watch(10, name);
DataWatcher.watch(2, name);
}
public boolean HasCustomName()
public boolean hasCustomName()
{
return DataWatcher.getString(10).length() > 0;
}
public void SetCustomNameVisible(boolean visible)
public void setCustomNameVisible(boolean visible)
{
DataWatcher.watch(11, Byte.valueOf((byte)(visible ? 1 : 0)));
DataWatcher.watch(3, Byte.valueOf((byte)(visible ? 1 : 0)));
}
public boolean GetCustomNameVisible()
public boolean getCustomNameVisible()
{
return DataWatcher.getByte(11) == 1;
}

View File

@ -40,4 +40,14 @@ public abstract class DisguiseLiving extends DisguiseBase
{
return (_random.nextFloat() - _random.nextFloat()) * 0.2F + 1.0F;
}
public void setHealth(float health)
{
DataWatcher.watch(6, Float.valueOf(health));
}
public float getHealth()
{
return DataWatcher.getFloat(6);
}
}

View File

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

View File

@ -59,8 +59,8 @@ public class MorphBat extends MorphGadget implements IThrown
this.ApplyArmor(player);
DisguiseBat disguise = new DisguiseBat(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -40,8 +40,8 @@ public class MorphBlaze extends MorphGadget
this.ApplyArmor(player);
DisguiseBlaze disguise = new DisguiseBlaze(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -50,8 +50,8 @@ public class MorphChicken extends MorphGadget
this.ApplyArmor(player);
DisguiseChicken disguise = new DisguiseChicken(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -34,8 +34,8 @@ public class MorphCow extends MorphGadget
this.ApplyArmor(player);
DisguiseCow disguise = new DisguiseCow(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -49,8 +49,8 @@ public class MorphCreeper extends MorphGadget
this.ApplyArmor(player);
DisguiseCreeper disguise = new DisguiseCreeper(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -45,8 +45,8 @@ public class MorphEnderman extends MorphGadget
this.ApplyArmor(player);
DisguiseEnderman disguise = new DisguiseEnderman(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -50,8 +50,8 @@ public class MorphPig extends MorphGadget
this.ApplyArmor(player);
DisguisePig disguise = new DisguisePig(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -37,8 +37,8 @@ public class MorphPumpkinKing extends MorphGadget
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.showArmor();
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
disguise.SetSkeletonType(SkeletonType.WITHER);
Manager.getDisguiseManager().disguise(disguise);

View File

@ -58,8 +58,8 @@ public class MorphVillager extends MorphGadget implements IThrown
this.ApplyArmor(player);
DisguiseVillager disguise = new DisguiseVillager(player);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
Manager.getDisguiseManager().disguise(disguise);
}

View File

@ -51,8 +51,8 @@ public class MountSheep extends HorseMount
horse.getInventory().setSaddle(new ItemStack(Material.SADDLE));
DisguiseSheep disguise = new DisguiseSheep(horse);
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.SetCustomNameVisible(true);
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
disguise.setCustomNameVisible(true);
//disguise.setColor(DyeColor.getByColor(org.bukkit.Color.fromRGB(100, 0, 200)));
Manager.getDisguiseManager().disguise(disguise);

View File

@ -454,8 +454,8 @@ public class HubManager extends MiniClientPlugin<HubClient>
if (ChatColor.stripColor(((LivingEntity)entity).getCustomName()).equalsIgnoreCase("Block Hunt"))
{
DisguiseSlime disguise = new DisguiseSlime(entity);
disguise.SetCustomNameVisible(true);
disguise.SetName(((LivingEntity)entity).getCustomName(), null);
disguise.setCustomNameVisible(true);
disguise.setName(((LivingEntity)entity).getCustomName(), null);
disguise.SetSize(2);
_disguiseManager.disguise(disguise);
}

View File

@ -49,8 +49,8 @@ public class KitBabyPig extends Kit
//Disguise
DisguisePig disguise = new DisguisePig(player);
disguise.SetName(C.cYellow + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cYellow + player.getName());
disguise.setCustomNameVisible(true);
disguise.setBaby();
Manager.GetDisguise().disguise(disguise);
}

View File

@ -42,8 +42,8 @@ public class KitPig extends Kit
//Disguise
DisguisePig disguise = new DisguisePig(player);
disguise.SetName(C.cYellow + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cYellow + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -49,8 +49,8 @@ public class KitSheepPig extends Kit
//Disguise
DisguiseSheep disguise = new DisguiseSheep(player);
disguise.SetName(C.cYellow + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cYellow + player.getName());
disguise.setCustomNameVisible(true);
disguise.setColor(DyeColor.PINK);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -66,8 +66,8 @@ public class KitHumanPeasant extends KitHuman
player.setHealth(4);
DisguiseWolf disguise = new DisguiseWolf(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -44,8 +44,8 @@ public class KitUndeadArcher extends KitUndead
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -41,8 +41,8 @@ public class KitUndeadGhoul extends KitUndead
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
DisguisePigZombie disguise = new DisguisePigZombie(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -44,8 +44,8 @@ public class KitUndeadZombie extends KitUndead
if (Manager.GetGame().GetTeam(player) != null)
{
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
}
Manager.GetDisguise().disguise(disguise);

View File

@ -44,8 +44,8 @@ public class KitAlphaChaser extends AbstractKitChaser
//Disguise
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(C.cRed + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cRed + player.getName());
disguise.setCustomNameVisible(true);
disguise.hideArmor();
disguise.SetSkeletonType(SkeletonType.WITHER);
Manager.GetDisguise().disguise(disguise);

View File

@ -41,8 +41,8 @@ public class KitChaser extends AbstractKitChaser
//Disguise
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(C.cRed + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cRed + player.getName());
disguise.setCustomNameVisible(true);
disguise.hideArmor();
Manager.GetDisguise().disguise(disguise);
}

View File

@ -50,8 +50,8 @@ public class KitBlaze extends Kit
//Disguise
DisguiseBlaze disguise = new DisguiseBlaze(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -52,8 +52,8 @@ public class KitChicken extends Kit
//Disguise
DisguiseChicken disguise = new DisguiseChicken(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -52,8 +52,8 @@ public class KitCreeper extends Kit
//Disguise
DisguiseCreeper disguise = new DisguiseCreeper(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -50,8 +50,8 @@ public class KitGolem extends Kit
//Disguise
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -52,8 +52,8 @@ public class KitSkeleton extends Kit
//Disguise
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -52,8 +52,8 @@ public class KitSlime extends Kit
//Disguise
DisguiseSlime disguise = new DisguiseSlime(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
disguise.SetSize(3);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -52,8 +52,8 @@ public class KitSnowman extends Kit
//Disguise
DisguiseSnowman disguise = new DisguiseSnowman(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -50,8 +50,8 @@ public class KitSpider extends Kit
//Disguise
DisguiseSpider disguise = new DisguiseSpider(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -52,8 +52,8 @@ public class KitWolf extends Kit
//Disguise
DisguiseBat disguise = new DisguiseBat(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -55,7 +55,7 @@ public class KitHiderTeleporter extends Kit
DisguiseSlime slime = new DisguiseSlime(player);
slime.SetSize(2);
slime.SetName(C.cAqua + player.getName());
slime.setName(C.cAqua + player.getName());
Manager.GetDisguise().disguise(slime);
}

View File

@ -71,8 +71,8 @@ public class KitCow extends SmashKit
//Disguise
DisguiseCow disguise = new DisguiseCow(player);
disguise.SetName(C.cRed + player.getName());//+ " the Furious Cow");
disguise.SetCustomNameVisible(true);
disguise.setName(C.cRed + player.getName());//+ " the Furious Cow");
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -80,11 +80,11 @@ public class KitBlaze extends SmashKit
DisguiseBlaze disguise = new DisguiseBlaze(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -82,11 +82,11 @@ public class KitChicken extends SmashKit
DisguiseChicken disguise = new DisguiseChicken(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -63,11 +63,11 @@ public class KitCow extends SmashKit
DisguiseCow disguise = new DisguiseCow(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -88,11 +88,11 @@ public class KitCreeper extends SmashKit
DisguiseCreeper disguise = new DisguiseCreeper(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -87,11 +87,11 @@ public class KitEnderman extends SmashKit
DisguiseEnderman disguise = new DisguiseEnderman(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
disguise.a(false);
Manager.GetDisguise().disguise(disguise);

View File

@ -79,11 +79,11 @@ public class KitGolem extends SmashKit
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -95,11 +95,11 @@ public class KitKnight extends SmashKit
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
//Horse

View File

@ -74,11 +74,11 @@ public class KitMagmaCube extends SmashKit
DisguiseMagmaCube disguise = new DisguiseMagmaCube(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
disguise.SetSize(1);

View File

@ -93,11 +93,11 @@ public class KitPig extends SmashKit
DisguisePig disguise = new DisguisePig(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -92,13 +92,13 @@ public class KitSheep extends SmashKit
DisguiseSheep disguise = new DisguiseSheep(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.setColor(DyeColor.WHITE);
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -93,11 +93,11 @@ public class KitSkeletalHorse extends SmashKit
disguise.setType(Variant.SKELETON_HORSE);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -86,11 +86,11 @@ public class KitSkeleton extends SmashKit
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
disguise.hideArmor();
Manager.GetDisguise().disguise(disguise);
}

View File

@ -67,11 +67,11 @@ public class KitSkySquid extends SmashKit
DisguiseSquid disguise = new DisguiseSquid(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -75,11 +75,11 @@ public class KitSlime extends SmashKit
DisguiseSlime disguise = new DisguiseSlime(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
disguise.SetSize(3);

View File

@ -87,11 +87,11 @@ public class KitSnowman extends SmashKit
DisguiseSnowman disguise = new DisguiseSnowman(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -94,11 +94,11 @@ public class KitSpider extends SmashKit
DisguiseSpider disguise = new DisguiseSpider(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -83,11 +83,11 @@ public class KitWitch extends SmashKit
DisguiseWitch disguise = new DisguiseWitch(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -74,11 +74,11 @@ public class KitWitherSkeleton extends SmashKit
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
disguise.SetSkeletonType(SkeletonType.WITHER);
disguise.hideArmor();
Manager.GetDisguise().disguise(disguise);

View File

@ -78,11 +78,11 @@ public class KitWolf extends SmashKit
DisguiseWolf disguise = new DisguiseWolf(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -47,8 +47,8 @@ public class KitRifle extends Kit
//Disguise
DisguiseSquid disguise = new DisguiseSquid(player);
disguise.SetName(C.cWhite + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cWhite + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -47,8 +47,8 @@ public class KitShotgun extends Kit
//Disguise
DisguiseSquid disguise = new DisguiseSquid(player);
disguise.SetName(C.cWhite + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cWhite + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -47,8 +47,8 @@ public class KitSniper extends Kit
//Disguise
DisguiseSquid disguise = new DisguiseSquid(player);
disguise.SetName(C.cWhite + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(C.cWhite + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -73,11 +73,11 @@ public class KitWitherMinion extends Kit
DisguiseWither disguise = new DisguiseWither(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -54,11 +54,11 @@ public class KitWitherWeb extends Kit
DisguiseWither disguise = new DisguiseWither(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -46,8 +46,8 @@ public class KitUndeadAlpha extends Kit
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetSkeletonType(SkeletonType.WITHER);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}

View File

@ -42,8 +42,8 @@ public class KitUndeadZombie extends Kit
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.SetCustomNameVisible(true);
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
}
}

View File

@ -69,11 +69,11 @@ public class PerkPigZombie extends Perk
DisguisePig disguise = new DisguisePig(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
//Sound
@ -102,11 +102,11 @@ public class PerkPigZombie extends Perk
DisguisePigZombie disguise = new DisguisePigZombie(player);
if (Manager.GetGame().GetTeam(player) != null)
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
else
disguise.SetName(player.getName());
disguise.setName(player.getName());
disguise.SetCustomNameVisible(true);
disguise.setCustomNameVisible(true);
Manager.GetDisguise().disguise(disguise);
//Sound