Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex
This commit is contained in:
commit
0e7adab3eb
@ -12,10 +12,11 @@ public enum Rank
|
|||||||
DEVELOPER("Dev", ChatColor.RED),
|
DEVELOPER("Dev", ChatColor.RED),
|
||||||
ADMIN("Admin", ChatColor.RED),
|
ADMIN("Admin", ChatColor.RED),
|
||||||
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
|
SNR_MODERATOR("Sr.Mod", ChatColor.GOLD),
|
||||||
MODERATOR("Mod", ChatColor.DARK_GREEN),
|
MODERATOR("Mod", ChatColor.GOLD),
|
||||||
HELPER("Helper", ChatColor.GREEN),
|
HELPER("Helper", ChatColor.DARK_AQUA),
|
||||||
MAPDEV("Mapper", ChatColor.BLUE),
|
MAPDEV("Mapper", ChatColor.BLUE),
|
||||||
YOUTUBE("YouTube", ChatColor.RED),
|
YOUTUBE("YouTube", ChatColor.RED),
|
||||||
|
LEGEND("Legend", ChatColor.GREEN),
|
||||||
HERO("Hero", ChatColor.LIGHT_PURPLE),
|
HERO("Hero", ChatColor.LIGHT_PURPLE),
|
||||||
ULTRA("Ultra", ChatColor.AQUA),
|
ULTRA("Ultra", ChatColor.AQUA),
|
||||||
ALL("", ChatColor.WHITE);
|
ALL("", ChatColor.WHITE);
|
||||||
|
@ -60,8 +60,13 @@ public class UtilFirework
|
|||||||
firework.remove();
|
firework.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Firework launchFirework(Location loc, Type type, Color color, boolean flicker, boolean trail, Vector dir, int power)
|
||||||
|
{
|
||||||
|
return launchFirework(loc, FireworkEffect.builder().flicker(flicker).withColor(color).with(type).trail(trail).build(), dir, power);
|
||||||
|
}
|
||||||
|
|
||||||
public static void playFirework(Location loc, Type type, Color color, boolean flicker, boolean trail)
|
public static void playFirework(Location loc, Type type, Color color, boolean flicker, boolean trail)
|
||||||
{
|
{
|
||||||
playFirework(loc, FireworkEffect.builder().flicker(false).withColor(color).with(type).trail(false).build());
|
playFirework(loc, FireworkEffect.builder().flicker(flicker).withColor(color).with(type).trail(trail).build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -18,14 +18,16 @@ public abstract class DisguiseInsentient extends DisguiseLiving
|
|||||||
|
|
||||||
DataWatcher.a(11, Byte.valueOf((byte)0));
|
DataWatcher.a(11, Byte.valueOf((byte)0));
|
||||||
DataWatcher.a(10, "");
|
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)
|
if (rank != null)
|
||||||
{
|
{
|
||||||
@ -36,20 +38,22 @@ public abstract class DisguiseInsentient extends DisguiseLiving
|
|||||||
}
|
}
|
||||||
|
|
||||||
DataWatcher.watch(10, name);
|
DataWatcher.watch(10, name);
|
||||||
|
DataWatcher.watch(2, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean HasCustomName()
|
public boolean hasCustomName()
|
||||||
{
|
{
|
||||||
return DataWatcher.getString(10).length() > 0;
|
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(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;
|
return DataWatcher.getByte(11) == 1;
|
||||||
}
|
}
|
||||||
|
@ -40,4 +40,14 @@ public abstract class DisguiseLiving extends DisguiseBase
|
|||||||
{
|
{
|
||||||
return (_random.nextFloat() - _random.nextFloat()) * 0.2F + 1.0F;
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -118,6 +118,7 @@ public class GadgetManager extends MiniPlugin
|
|||||||
addGadget(new MorphCreeper(this));
|
addGadget(new MorphCreeper(this));
|
||||||
addGadget(new MorphBlaze(this));
|
addGadget(new MorphBlaze(this));
|
||||||
//addGadget(new MorphGeno(this));
|
//addGadget(new MorphGeno(this));
|
||||||
|
addGadget(new MorphWither(this));
|
||||||
|
|
||||||
// Particles
|
// Particles
|
||||||
addGadget(new ParticleFoot(this));
|
addGadget(new ParticleFoot(this));
|
||||||
@ -128,6 +129,8 @@ public class GadgetManager extends MiniPlugin
|
|||||||
addGadget(new ParticleGreen(this));
|
addGadget(new ParticleGreen(this));
|
||||||
addGadget(new ParticleHeart(this));
|
addGadget(new ParticleHeart(this));
|
||||||
addGadget(new ParticleFairy(this));
|
addGadget(new ParticleFairy(this));
|
||||||
|
addGadget(new ParticleLegend(this));
|
||||||
|
addGadget(new ParticleBlizzard(this));
|
||||||
|
|
||||||
// Music
|
// Music
|
||||||
addGadget(new MusicGadget(this, "13 Disc", new String[] {""}, -2, 2256, 178000));
|
addGadget(new MusicGadget(this, "13 Disc", new String[] {""}, -2, 2256, 178000));
|
||||||
|
@ -59,8 +59,8 @@ public class MorphBat extends MorphGadget implements IThrown
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseBat disguise = new DisguiseBat(player);
|
DisguiseBat disguise = new DisguiseBat(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,8 +40,8 @@ public class MorphBlaze extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,8 +50,8 @@ public class MorphChicken extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseChicken disguise = new DisguiseChicken(player);
|
DisguiseChicken disguise = new DisguiseChicken(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,8 +34,8 @@ public class MorphCow extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseCow disguise = new DisguiseCow(player);
|
DisguiseCow disguise = new DisguiseCow(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,8 +49,8 @@ public class MorphCreeper extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,8 +45,8 @@ public class MorphEnderman extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseEnderman disguise = new DisguiseEnderman(player);
|
DisguiseEnderman disguise = new DisguiseEnderman(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,8 +50,8 @@ public class MorphPig extends MorphGadget
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguisePig disguise = new DisguisePig(player);
|
DisguisePig disguise = new DisguisePig(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,8 +37,8 @@ public class MorphPumpkinKing extends MorphGadget
|
|||||||
|
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.showArmor();
|
disguise.showArmor();
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.SetSkeletonType(SkeletonType.WITHER);
|
disguise.SetSkeletonType(SkeletonType.WITHER);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
|
|
||||||
|
@ -58,8 +58,8 @@ public class MorphVillager extends MorphGadget implements IThrown
|
|||||||
this.ApplyArmor(player);
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
DisguiseVillager disguise = new DisguiseVillager(player);
|
DisguiseVillager disguise = new DisguiseVillager(player);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -0,0 +1,208 @@
|
|||||||
|
package mineplex.core.gadget.gadgets;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
|
||||||
|
import org.bukkit.GameMode;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.Sound;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.entity.WitherSkull;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.entity.EntityExplodeEvent;
|
||||||
|
import org.bukkit.event.player.PlayerInteractEvent;
|
||||||
|
import org.bukkit.event.player.PlayerJoinEvent;
|
||||||
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
import mineplex.core.common.Rank;
|
||||||
|
import mineplex.core.common.util.C;
|
||||||
|
import mineplex.core.common.util.UtilAction;
|
||||||
|
import mineplex.core.common.util.UtilAlg;
|
||||||
|
import mineplex.core.common.util.UtilEnt;
|
||||||
|
import mineplex.core.common.util.UtilEvent;
|
||||||
|
import mineplex.core.common.util.UtilParticle;
|
||||||
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
|
import mineplex.core.common.util.UtilEvent.ActionType;
|
||||||
|
import mineplex.core.common.util.UtilParticle.ParticleType;
|
||||||
|
import mineplex.core.disguise.disguises.DisguiseBase;
|
||||||
|
import mineplex.core.disguise.disguises.DisguiseWither;
|
||||||
|
import mineplex.core.recharge.Recharge;
|
||||||
|
import mineplex.core.updater.UpdateType;
|
||||||
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
|
import mineplex.core.gadget.GadgetManager;
|
||||||
|
import mineplex.core.gadget.types.MorphGadget;
|
||||||
|
|
||||||
|
public class MorphWither extends MorphGadget
|
||||||
|
{
|
||||||
|
private ArrayList<WitherSkull> _skulls = new ArrayList<WitherSkull>();
|
||||||
|
|
||||||
|
public MorphWither(GadgetManager manager)
|
||||||
|
{
|
||||||
|
super(manager, "Wither Morph", new String[]
|
||||||
|
{
|
||||||
|
C.cWhite + "Become a legendary Wither!",
|
||||||
|
" ",
|
||||||
|
C.cYellow + "Left Click" + C.cGray + " to use " + C.cGreen + "Wither Skull",
|
||||||
|
" ",
|
||||||
|
C.cPurple + "Unlocked with Legend Rank",
|
||||||
|
},
|
||||||
|
-1,
|
||||||
|
Material.SKULL_ITEM, (byte)1);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void EnableCustom(final Player player)
|
||||||
|
{
|
||||||
|
this.ApplyArmor(player);
|
||||||
|
|
||||||
|
player.setMaxHealth(300);
|
||||||
|
player.setHealth(300);
|
||||||
|
|
||||||
|
DisguiseWither disguise = new DisguiseWither(player);
|
||||||
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
|
//disguise.setCustomNameVisible(true);
|
||||||
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
|
|
||||||
|
player.setMaxHealth(20);
|
||||||
|
player.setHealth(20);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void DisableCustom(Player player)
|
||||||
|
{
|
||||||
|
this.RemoveArmor(player);
|
||||||
|
Manager.getDisguiseManager().undisguise(player);
|
||||||
|
|
||||||
|
player.setAllowFlight(false);
|
||||||
|
player.setFlying(false);
|
||||||
|
|
||||||
|
player.setMaxHealth(20);
|
||||||
|
player.setHealth(20);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void witherSkull(PlayerInteractEvent event)
|
||||||
|
{
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
|
||||||
|
if (!IsActive(player))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!UtilEvent.isAction(event, ActionType.L))
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (!Recharge.Instance.use(player, GetName(), 1600, false, false))
|
||||||
|
return;
|
||||||
|
|
||||||
|
Vector offset = player.getLocation().getDirection();
|
||||||
|
if (offset.getY() < 0)
|
||||||
|
offset.setY(0);
|
||||||
|
|
||||||
|
_skulls.add(player.launchProjectile(WitherSkull.class));
|
||||||
|
|
||||||
|
//Effect
|
||||||
|
player.getWorld().playSound(player.getLocation(), Sound.WITHER_SHOOT, 0.5f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void explode(EntityExplodeEvent event)
|
||||||
|
{
|
||||||
|
if (!_skulls.contains(event.getEntity()))
|
||||||
|
return;
|
||||||
|
|
||||||
|
event.setCancelled(true);
|
||||||
|
|
||||||
|
WitherSkull skull = (WitherSkull)event.getEntity();
|
||||||
|
|
||||||
|
UtilParticle.PlayParticle(ParticleType.LARGE_EXPLODE, skull.getLocation(), 0, 0, 0, 0, 1);
|
||||||
|
skull.getWorld().playSound(skull.getLocation(), Sound.EXPLODE, 2f, 1f);
|
||||||
|
|
||||||
|
HashMap<Player, Double> players = UtilPlayer.getInRadius(event.getLocation(), 6);
|
||||||
|
for (Player player : players.keySet())
|
||||||
|
{
|
||||||
|
if (Manager.collideEvent(this, player))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
double mult = players.get(player);
|
||||||
|
|
||||||
|
//Knockback
|
||||||
|
UtilAction.velocity(player, UtilAlg.getTrajectory(event.getLocation(), player.getLocation()), 2 * mult, false, 0, 0.6 + 0.4 * mult, 2, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void clean(UpdateEvent event)
|
||||||
|
{
|
||||||
|
if (event.getType() != UpdateType.FAST)
|
||||||
|
return;
|
||||||
|
|
||||||
|
Iterator<WitherSkull> skullIterator = _skulls.iterator();
|
||||||
|
|
||||||
|
while (skullIterator.hasNext())
|
||||||
|
{
|
||||||
|
WitherSkull skull = skullIterator.next();
|
||||||
|
|
||||||
|
if (!skull.isValid())
|
||||||
|
{
|
||||||
|
skullIterator.remove();
|
||||||
|
skull.remove();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void flight(UpdateEvent event)
|
||||||
|
{
|
||||||
|
if (event.getType() != UpdateType.TICK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (Player player : GetActive())
|
||||||
|
{
|
||||||
|
if (player.getGameMode() == GameMode.CREATIVE)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
player.setAllowFlight(true);
|
||||||
|
player.setFlying(true);
|
||||||
|
|
||||||
|
if (UtilEnt.isGrounded(player))
|
||||||
|
player.setVelocity(new Vector(0,1,0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void legendOwner(PlayerJoinEvent event)
|
||||||
|
{
|
||||||
|
if (Manager.getClientManager().Get(event.getPlayer()).GetRank() == Rank.LEGEND ||
|
||||||
|
Manager.getClientManager().Get(event.getPlayer()).GetRank() == Rank.ADMIN ||
|
||||||
|
Manager.getClientManager().Get(event.getPlayer()).GetRank() == Rank.DEVELOPER ||
|
||||||
|
Manager.getClientManager().Get(event.getPlayer()).GetRank() == Rank.OWNER)
|
||||||
|
{
|
||||||
|
Manager.getDonationManager().Get(event.getPlayer().getName()).AddUnknownSalesPackagesOwned(GetName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWitherData(String text, double healthPercent)
|
||||||
|
{
|
||||||
|
Iterator<Player> activeIterator = GetActive().iterator();
|
||||||
|
|
||||||
|
while (activeIterator.hasNext())
|
||||||
|
{
|
||||||
|
Player player = activeIterator.next();
|
||||||
|
|
||||||
|
DisguiseBase disguise = Manager.getDisguiseManager().getDisguise(player);
|
||||||
|
|
||||||
|
if (disguise == null || !(disguise instanceof DisguiseWither))
|
||||||
|
{
|
||||||
|
DisableCustom(player);
|
||||||
|
activeIterator.remove();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
((DisguiseWither)disguise).setName(text);
|
||||||
|
((DisguiseWither)disguise).setHealth((float) (healthPercent * 300));
|
||||||
|
Manager.getDisguiseManager().updateDisguise(disguise);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,80 @@
|
|||||||
|
package mineplex.core.gadget.gadgets;
|
||||||
|
|
||||||
|
import org.bukkit.Color;
|
||||||
|
import org.bukkit.Effect;
|
||||||
|
import org.bukkit.GameMode;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.Sound;
|
||||||
|
import org.bukkit.FireworkEffect.Type;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
|
import mineplex.core.common.util.C;
|
||||||
|
import mineplex.core.common.util.UtilFirework;
|
||||||
|
import mineplex.core.common.util.UtilParticle;
|
||||||
|
import mineplex.core.common.util.UtilServer;
|
||||||
|
import mineplex.core.common.util.UtilParticle.ParticleType;
|
||||||
|
import mineplex.core.gadget.types.ParticleGadget;
|
||||||
|
import mineplex.core.updater.UpdateType;
|
||||||
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
|
import mineplex.core.gadget.GadgetManager;
|
||||||
|
|
||||||
|
public class ParticleBlizzard extends ParticleGadget
|
||||||
|
{
|
||||||
|
|
||||||
|
public ParticleBlizzard(GadgetManager manager)
|
||||||
|
{
|
||||||
|
super(manager, "Test", new String[]
|
||||||
|
{
|
||||||
|
C.cWhite + "",
|
||||||
|
},
|
||||||
|
1,
|
||||||
|
Material.FIREWORK, (byte)0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void playParticle(UpdateEvent event)
|
||||||
|
{
|
||||||
|
if (event.getType() != UpdateType.TICK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (Player player : GetActive())
|
||||||
|
{
|
||||||
|
if (!shouldDisplay(player))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (Manager.isMoving(player))
|
||||||
|
{
|
||||||
|
for (int i=0 ; i<2 ; i++)
|
||||||
|
player.getWorld().playEffect(player.getLocation().add(r(1), Math.random() + 0.5, r(1)), Effect.COLOURED_DUST, 0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
for (int i=0 ; i<2 ; i++)
|
||||||
|
player.getWorld().playEffect(player.getLocation().add(r(2), Math.random() + 0.5, r(2)), Effect.COLOURED_DUST, 0);
|
||||||
|
|
||||||
|
if (Math.random() > 0.95)
|
||||||
|
{
|
||||||
|
UtilFirework.launchFirework(player.getEyeLocation(), Type.BALL, color(), true, true, new Vector(r(0.1),r(0.1),r(0.1)), 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private Color color()
|
||||||
|
{
|
||||||
|
double r = Math.random();
|
||||||
|
|
||||||
|
if (r > 0.8) return Color.RED;
|
||||||
|
if (r > 0.6) return Color.YELLOW;
|
||||||
|
if (r > 0.4) return Color.LIME;
|
||||||
|
if (r > 0.2) return Color.AQUA;
|
||||||
|
else return Color.FUCHSIA;
|
||||||
|
}
|
||||||
|
|
||||||
|
public double r(double mult)
|
||||||
|
{
|
||||||
|
return (Math.random() - 0.5)*mult;
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,43 @@
|
|||||||
|
package mineplex.core.gadget.gadgets;
|
||||||
|
|
||||||
|
import org.bukkit.Effect;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
|
||||||
|
import mineplex.core.common.util.C;
|
||||||
|
import mineplex.core.gadget.types.ParticleGadget;
|
||||||
|
import mineplex.core.updater.UpdateType;
|
||||||
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
|
import mineplex.core.gadget.GadgetManager;
|
||||||
|
|
||||||
|
public class ParticleLegend extends ParticleGadget
|
||||||
|
{
|
||||||
|
public ParticleLegend(GadgetManager manager)
|
||||||
|
{
|
||||||
|
super(manager, "Legendary Aura", new String[]
|
||||||
|
{
|
||||||
|
C.cWhite + "These mystic particle attach to",
|
||||||
|
C.cWhite + "only the most legendary of players!",
|
||||||
|
" ",
|
||||||
|
C.cPurple + "Unlocked with Legend Rank",
|
||||||
|
},
|
||||||
|
-2,
|
||||||
|
Material.ENDER_PORTAL, (byte)0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void playParticle(UpdateEvent event)
|
||||||
|
{
|
||||||
|
if (event.getType() != UpdateType.TICK)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (Player player : GetActive())
|
||||||
|
{
|
||||||
|
if (!shouldDisplay(player))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
player.getWorld().playEffect(player.getLocation().add(0, 1, 0), Effect.ENDER_SIGNAL, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -51,8 +51,8 @@ public class MountSheep extends HorseMount
|
|||||||
horse.getInventory().setSaddle(new ItemStack(Material.SADDLE));
|
horse.getInventory().setSaddle(new ItemStack(Material.SADDLE));
|
||||||
|
|
||||||
DisguiseSheep disguise = new DisguiseSheep(horse);
|
DisguiseSheep disguise = new DisguiseSheep(horse);
|
||||||
disguise.SetName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
disguise.setName(player.getName(), Manager.getClientManager().Get(player).GetRank());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
//disguise.setColor(DyeColor.getByColor(org.bukkit.Color.fromRGB(100, 0, 200)));
|
//disguise.setColor(DyeColor.getByColor(org.bukkit.Color.fromRGB(100, 0, 200)));
|
||||||
Manager.getDisguiseManager().disguise(disguise);
|
Manager.getDisguiseManager().disguise(disguise);
|
||||||
|
|
||||||
|
@ -18,9 +18,9 @@ public class BuildingPage extends ShopPageBase<ClansManager, BuildingShop>
|
|||||||
protected void BuildPage()
|
protected void BuildPage()
|
||||||
{
|
{
|
||||||
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
|
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
|
||||||
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Wood", 25, 64));
|
addPvpItem(1, new PvpItem(Material.WOOD, (byte)0, 1, "Wood", 15, 64));
|
||||||
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
|
addPvpItem(1, new PvpItem(Material.BRICK, (byte)0, 1, "Bricks", 30, 64));
|
||||||
addPvpItem(1, new PvpItem(Material.STONE, (byte)0, 1, "Stone", 25, 64));
|
addPvpItem(1, new PvpItem(Material.SANDSTONE, (byte)0, 1, "Sandstone", 30, 64));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addPvpItem(int slot, PvpItem item)
|
public void addPvpItem(int slot, PvpItem item)
|
||||||
|
@ -5,9 +5,11 @@ import java.util.HashMap;
|
|||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
import org.bukkit.Color;
|
||||||
import org.bukkit.GameMode;
|
import org.bukkit.GameMode;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
|
import org.bukkit.craftbukkit.v1_7_R4.CraftWorld;
|
||||||
import org.bukkit.entity.Egg;
|
import org.bukkit.entity.Egg;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
@ -50,6 +52,7 @@ import mineplex.core.common.util.C;
|
|||||||
import mineplex.core.common.util.F;
|
import mineplex.core.common.util.F;
|
||||||
import mineplex.core.common.util.UtilAction;
|
import mineplex.core.common.util.UtilAction;
|
||||||
import mineplex.core.common.util.UtilAlg;
|
import mineplex.core.common.util.UtilAlg;
|
||||||
|
import mineplex.core.common.util.UtilFirework;
|
||||||
import mineplex.core.common.util.UtilInv;
|
import mineplex.core.common.util.UtilInv;
|
||||||
import mineplex.core.common.util.UtilMath;
|
import mineplex.core.common.util.UtilMath;
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
@ -456,8 +459,8 @@ public class HubManager extends MiniClientPlugin<HubClient>
|
|||||||
if (ChatColor.stripColor(((LivingEntity)entity).getCustomName()).equalsIgnoreCase("Block Hunt"))
|
if (ChatColor.stripColor(((LivingEntity)entity).getCustomName()).equalsIgnoreCase("Block Hunt"))
|
||||||
{
|
{
|
||||||
DisguiseSlime disguise = new DisguiseSlime(entity);
|
DisguiseSlime disguise = new DisguiseSlime(entity);
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.SetName(((LivingEntity)entity).getCustomName(), null);
|
disguise.setName(((LivingEntity)entity).getCustomName(), null);
|
||||||
disguise.SetSize(2);
|
disguise.SetSize(2);
|
||||||
_disguiseManager.disguise(disguise);
|
_disguiseManager.disguise(disguise);
|
||||||
}
|
}
|
||||||
@ -515,7 +518,15 @@ public class HubManager extends MiniClientPlugin<HubClient>
|
|||||||
UtilTabTitle.setHeaderAndFooter(player, " ", "Visit " + C.cGreen + "www.mineplex.com" + ChatColor.RESET + " for News, Forums and Shop");
|
UtilTabTitle.setHeaderAndFooter(player, " ", "Visit " + C.cGreen + "www.mineplex.com" + ChatColor.RESET + " for News, Forums and Shop");
|
||||||
|
|
||||||
//Public Message
|
//Public Message
|
||||||
|
if (_clientManager.Get(player).GetRank() != Rank.OWNER)
|
||||||
event.setJoinMessage(null);
|
event.setJoinMessage(null);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
event.setJoinMessage(C.cGreen + C.Bold + "Legend " + player.getName() + " has joined!");
|
||||||
|
UtilFirework.playFirework(player.getEyeLocation(), org.bukkit.FireworkEffect.Type.BALL_LARGE, Color.LIME, true, true);
|
||||||
|
player.getWorld().playSound(player.getEyeLocation(), Sound.WITHER_SPAWN, 2f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
//Teleport
|
//Teleport
|
||||||
player.teleport(GetSpawn().add(0, 10, 0));
|
player.teleport(GetSpawn().add(0, 10, 0));
|
||||||
|
@ -20,6 +20,7 @@ import mineplex.core.disguise.disguises.DisguiseBat;
|
|||||||
import mineplex.core.disguise.disguises.DisguiseChicken;
|
import mineplex.core.disguise.disguises.DisguiseChicken;
|
||||||
import mineplex.core.disguise.disguises.DisguiseCreeper;
|
import mineplex.core.disguise.disguises.DisguiseCreeper;
|
||||||
import mineplex.core.disguise.disguises.DisguiseEnderman;
|
import mineplex.core.disguise.disguises.DisguiseEnderman;
|
||||||
|
import mineplex.core.disguise.disguises.DisguiseWither;
|
||||||
import mineplex.core.updater.UpdateType;
|
import mineplex.core.updater.UpdateType;
|
||||||
import mineplex.core.updater.event.UpdateEvent;
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
import mineplex.hub.HubManager;
|
import mineplex.hub.HubManager;
|
||||||
@ -45,7 +46,8 @@ public class JumpManager extends MiniPlugin
|
|||||||
|
|
||||||
//Chicken Cancel
|
//Chicken Cancel
|
||||||
DisguiseBase disguise = Manager.GetDisguise().getDisguise(player);
|
DisguiseBase disguise = Manager.GetDisguise().getDisguise(player);
|
||||||
if (disguise != null && ((disguise instanceof DisguiseChicken && !((DisguiseChicken)disguise).isBaby()) || disguise instanceof DisguiseBat || disguise instanceof DisguiseEnderman))
|
if (disguise != null &&
|
||||||
|
((disguise instanceof DisguiseChicken && !((DisguiseChicken)disguise).isBaby()) || disguise instanceof DisguiseBat || disguise instanceof DisguiseEnderman || disguise instanceof DisguiseWither))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
@ -21,6 +21,9 @@ import mineplex.core.common.util.UtilServer;
|
|||||||
import mineplex.core.common.util.UtilTextTop;
|
import mineplex.core.common.util.UtilTextTop;
|
||||||
import mineplex.core.common.util.UtilTime;
|
import mineplex.core.common.util.UtilTime;
|
||||||
import mineplex.core.common.util.UtilTextMiddle;
|
import mineplex.core.common.util.UtilTextMiddle;
|
||||||
|
import mineplex.core.gadget.gadgets.MorphWither;
|
||||||
|
import mineplex.core.gadget.types.Gadget;
|
||||||
|
import mineplex.core.gadget.types.GadgetType;
|
||||||
import mineplex.core.mount.Mount;
|
import mineplex.core.mount.Mount;
|
||||||
import mineplex.core.mount.types.MountDragon;
|
import mineplex.core.mount.types.MountDragon;
|
||||||
import mineplex.core.updater.UpdateType;
|
import mineplex.core.updater.UpdateType;
|
||||||
@ -273,6 +276,14 @@ public class NewsManager extends MiniPlugin
|
|||||||
//((MountDragon)mount).setHealthPercent(healthPercent);
|
//((MountDragon)mount).setHealthPercent(healthPercent);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (Gadget gadget : Manager.GetGadget().getGadgets(GadgetType.Morph))
|
||||||
|
{
|
||||||
|
if (gadget instanceof MorphWither)
|
||||||
|
{
|
||||||
|
((MorphWither)gadget).setWitherData(text, healthPercent);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
|
@ -49,8 +49,8 @@ public class KitBabyPig extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguisePig disguise = new DisguisePig(player);
|
DisguisePig disguise = new DisguisePig(player);
|
||||||
disguise.SetName(C.cYellow + player.getName());
|
disguise.setName(C.cYellow + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.setBaby();
|
disguise.setBaby();
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
@ -42,8 +42,8 @@ public class KitPig extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguisePig disguise = new DisguisePig(player);
|
DisguisePig disguise = new DisguisePig(player);
|
||||||
disguise.SetName(C.cYellow + player.getName());
|
disguise.setName(C.cYellow + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -49,8 +49,8 @@ public class KitSheepPig extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSheep disguise = new DisguiseSheep(player);
|
DisguiseSheep disguise = new DisguiseSheep(player);
|
||||||
disguise.SetName(C.cYellow + player.getName());
|
disguise.setName(C.cYellow + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.setColor(DyeColor.PINK);
|
disguise.setColor(DyeColor.PINK);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
@ -66,8 +66,8 @@ public class KitHumanPeasant extends KitHuman
|
|||||||
player.setHealth(4);
|
player.setHealth(4);
|
||||||
|
|
||||||
DisguiseWolf disguise = new DisguiseWolf(player);
|
DisguiseWolf disguise = new DisguiseWolf(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -44,8 +44,8 @@ public class KitUndeadArcher extends KitUndead
|
|||||||
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
|
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.BOW));
|
||||||
|
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,8 +41,8 @@ public class KitUndeadGhoul extends KitUndead
|
|||||||
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
|
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
|
||||||
|
|
||||||
DisguisePigZombie disguise = new DisguisePigZombie(player);
|
DisguisePigZombie disguise = new DisguisePigZombie(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,8 +44,8 @@ public class KitUndeadZombie extends KitUndead
|
|||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
if (Manager.GetGame().GetTeam(player) != null)
|
||||||
{
|
{
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
@ -44,8 +44,8 @@ public class KitAlphaChaser extends AbstractKitChaser
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetName(C.cRed + player.getName());
|
disguise.setName(C.cRed + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.hideArmor();
|
disguise.hideArmor();
|
||||||
disguise.SetSkeletonType(SkeletonType.WITHER);
|
disguise.SetSkeletonType(SkeletonType.WITHER);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
@ -41,8 +41,8 @@ public class KitChaser extends AbstractKitChaser
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetName(C.cRed + player.getName());
|
disguise.setName(C.cRed + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.hideArmor();
|
disguise.hideArmor();
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
@ -50,8 +50,8 @@ public class KitBlaze extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,8 +52,8 @@ public class KitChicken extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseChicken disguise = new DisguiseChicken(player);
|
DisguiseChicken disguise = new DisguiseChicken(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,8 +52,8 @@ public class KitCreeper extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -50,8 +50,8 @@ public class KitGolem extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
|
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,8 +52,8 @@ public class KitSkeleton extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,8 +52,8 @@ public class KitSlime extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSlime disguise = new DisguiseSlime(player);
|
DisguiseSlime disguise = new DisguiseSlime(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.SetSize(3);
|
disguise.SetSize(3);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
@ -52,8 +52,8 @@ public class KitSnowman extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSnowman disguise = new DisguiseSnowman(player);
|
DisguiseSnowman disguise = new DisguiseSnowman(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -50,8 +50,8 @@ public class KitSpider extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSpider disguise = new DisguiseSpider(player);
|
DisguiseSpider disguise = new DisguiseSpider(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -52,8 +52,8 @@ public class KitWolf extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseBat disguise = new DisguiseBat(player);
|
DisguiseBat disguise = new DisguiseBat(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -55,7 +55,7 @@ public class KitHiderTeleporter extends Kit
|
|||||||
|
|
||||||
DisguiseSlime slime = new DisguiseSlime(player);
|
DisguiseSlime slime = new DisguiseSlime(player);
|
||||||
slime.SetSize(2);
|
slime.SetSize(2);
|
||||||
slime.SetName(C.cAqua + player.getName());
|
slime.setName(C.cAqua + player.getName());
|
||||||
Manager.GetDisguise().disguise(slime);
|
Manager.GetDisguise().disguise(slime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,8 +71,8 @@ public class KitCow extends SmashKit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseCow disguise = new DisguiseCow(player);
|
DisguiseCow disguise = new DisguiseCow(player);
|
||||||
disguise.SetName(C.cRed + player.getName());//+ " the Furious Cow");
|
disguise.setName(C.cRed + player.getName());//+ " the Furious Cow");
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,11 +80,11 @@ public class KitBlaze extends SmashKit
|
|||||||
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
DisguiseBlaze disguise = new DisguiseBlaze(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,11 +82,11 @@ public class KitChicken extends SmashKit
|
|||||||
DisguiseChicken disguise = new DisguiseChicken(player);
|
DisguiseChicken disguise = new DisguiseChicken(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -63,11 +63,11 @@ public class KitCow extends SmashKit
|
|||||||
DisguiseCow disguise = new DisguiseCow(player);
|
DisguiseCow disguise = new DisguiseCow(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -88,11 +88,11 @@ public class KitCreeper extends SmashKit
|
|||||||
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
DisguiseCreeper disguise = new DisguiseCreeper(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,11 +87,11 @@ public class KitEnderman extends SmashKit
|
|||||||
DisguiseEnderman disguise = new DisguiseEnderman(player);
|
DisguiseEnderman disguise = new DisguiseEnderman(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.a(false);
|
disguise.a(false);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
|
@ -79,11 +79,11 @@ public class KitGolem extends SmashKit
|
|||||||
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
|
DisguiseIronGolem disguise = new DisguiseIronGolem(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -95,11 +95,11 @@ public class KitKnight extends SmashKit
|
|||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
//Horse
|
//Horse
|
||||||
|
@ -74,11 +74,11 @@ public class KitMagmaCube extends SmashKit
|
|||||||
DisguiseMagmaCube disguise = new DisguiseMagmaCube(player);
|
DisguiseMagmaCube disguise = new DisguiseMagmaCube(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
disguise.SetSize(1);
|
disguise.SetSize(1);
|
||||||
|
@ -93,11 +93,11 @@ public class KitPig extends SmashKit
|
|||||||
DisguisePig disguise = new DisguisePig(player);
|
DisguisePig disguise = new DisguisePig(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -92,13 +92,13 @@ public class KitSheep extends SmashKit
|
|||||||
DisguiseSheep disguise = new DisguiseSheep(player);
|
DisguiseSheep disguise = new DisguiseSheep(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.setColor(DyeColor.WHITE);
|
disguise.setColor(DyeColor.WHITE);
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -93,11 +93,11 @@ public class KitSkeletalHorse extends SmashKit
|
|||||||
disguise.setType(Variant.SKELETON_HORSE);
|
disguise.setType(Variant.SKELETON_HORSE);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,11 +86,11 @@ public class KitSkeleton extends SmashKit
|
|||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.hideArmor();
|
disguise.hideArmor();
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
@ -67,11 +67,11 @@ public class KitSkySquid extends SmashKit
|
|||||||
DisguiseSquid disguise = new DisguiseSquid(player);
|
DisguiseSquid disguise = new DisguiseSquid(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -75,11 +75,11 @@ public class KitSlime extends SmashKit
|
|||||||
DisguiseSlime disguise = new DisguiseSlime(player);
|
DisguiseSlime disguise = new DisguiseSlime(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
disguise.SetSize(3);
|
disguise.SetSize(3);
|
||||||
|
@ -87,11 +87,11 @@ public class KitSnowman extends SmashKit
|
|||||||
DisguiseSnowman disguise = new DisguiseSnowman(player);
|
DisguiseSnowman disguise = new DisguiseSnowman(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -94,11 +94,11 @@ public class KitSpider extends SmashKit
|
|||||||
DisguiseSpider disguise = new DisguiseSpider(player);
|
DisguiseSpider disguise = new DisguiseSpider(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,11 +83,11 @@ public class KitWitch extends SmashKit
|
|||||||
DisguiseWitch disguise = new DisguiseWitch(player);
|
DisguiseWitch disguise = new DisguiseWitch(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,11 +74,11 @@ public class KitWitherSkeleton extends SmashKit
|
|||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
disguise.SetSkeletonType(SkeletonType.WITHER);
|
disguise.SetSkeletonType(SkeletonType.WITHER);
|
||||||
disguise.hideArmor();
|
disguise.hideArmor();
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
@ -78,11 +78,11 @@ public class KitWolf extends SmashKit
|
|||||||
DisguiseWolf disguise = new DisguiseWolf(player);
|
DisguiseWolf disguise = new DisguiseWolf(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,8 @@ public class KitRifle extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSquid disguise = new DisguiseSquid(player);
|
DisguiseSquid disguise = new DisguiseSquid(player);
|
||||||
disguise.SetName(C.cWhite + player.getName());
|
disguise.setName(C.cWhite + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,8 @@ public class KitShotgun extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSquid disguise = new DisguiseSquid(player);
|
DisguiseSquid disguise = new DisguiseSquid(player);
|
||||||
disguise.SetName(C.cWhite + player.getName());
|
disguise.setName(C.cWhite + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -47,8 +47,8 @@ public class KitSniper extends Kit
|
|||||||
|
|
||||||
//Disguise
|
//Disguise
|
||||||
DisguiseSquid disguise = new DisguiseSquid(player);
|
DisguiseSquid disguise = new DisguiseSquid(player);
|
||||||
disguise.SetName(C.cWhite + player.getName());
|
disguise.setName(C.cWhite + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -73,11 +73,11 @@ public class KitWitherMinion extends Kit
|
|||||||
DisguiseWither disguise = new DisguiseWither(player);
|
DisguiseWither disguise = new DisguiseWither(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,11 +54,11 @@ public class KitWitherWeb extends Kit
|
|||||||
DisguiseWither disguise = new DisguiseWither(player);
|
DisguiseWither disguise = new DisguiseWither(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,8 +46,8 @@ public class KitUndeadAlpha extends Kit
|
|||||||
|
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetSkeletonType(SkeletonType.WITHER);
|
disguise.SetSkeletonType(SkeletonType.WITHER);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,8 +42,8 @@ public class KitUndeadZombie extends Kit
|
|||||||
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
|
player.getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.STONE_AXE));
|
||||||
|
|
||||||
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
DisguiseSkeleton disguise = new DisguiseSkeleton(player);
|
||||||
disguise.SetName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
disguise.setName(Manager.GetGame().GetTeam(player).GetColor() + player.getName());
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -69,11 +69,11 @@ public class PerkPigZombie extends Perk
|
|||||||
DisguisePig disguise = new DisguisePig(player);
|
DisguisePig disguise = new DisguisePig(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
//Sound
|
//Sound
|
||||||
@ -102,11 +102,11 @@ public class PerkPigZombie extends Perk
|
|||||||
DisguisePigZombie disguise = new DisguisePigZombie(player);
|
DisguisePigZombie disguise = new DisguisePigZombie(player);
|
||||||
|
|
||||||
if (Manager.GetGame().GetTeam(player) != null)
|
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
|
else
|
||||||
disguise.SetName(player.getName());
|
disguise.setName(player.getName());
|
||||||
|
|
||||||
disguise.SetCustomNameVisible(true);
|
disguise.setCustomNameVisible(true);
|
||||||
Manager.GetDisguise().disguise(disguise);
|
Manager.GetDisguise().disguise(disguise);
|
||||||
|
|
||||||
//Sound
|
//Sound
|
||||||
|
@ -13,6 +13,9 @@ import mineplex.core.common.util.UtilServer;
|
|||||||
import mineplex.core.common.util.UtilTextBottom;
|
import mineplex.core.common.util.UtilTextBottom;
|
||||||
import mineplex.core.common.util.UtilTextTop;
|
import mineplex.core.common.util.UtilTextTop;
|
||||||
import mineplex.core.common.util.UtilTime;
|
import mineplex.core.common.util.UtilTime;
|
||||||
|
import mineplex.core.gadget.gadgets.MorphWither;
|
||||||
|
import mineplex.core.gadget.types.Gadget;
|
||||||
|
import mineplex.core.gadget.types.GadgetType;
|
||||||
import mineplex.minecraft.game.core.condition.Condition.ConditionType;
|
import mineplex.minecraft.game.core.condition.Condition.ConditionType;
|
||||||
import mineplex.core.mount.Mount;
|
import mineplex.core.mount.Mount;
|
||||||
import mineplex.core.mount.types.MountDragon;
|
import mineplex.core.mount.types.MountDragon;
|
||||||
@ -104,6 +107,14 @@ public class GameManager implements Listener
|
|||||||
((MountDragon) mount).setHealthPercent(health);
|
((MountDragon) mount).setHealthPercent(health);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (Gadget gadget : Manager.getCosmeticManager().getGadgetManager().getGadgets(GadgetType.Morph))
|
||||||
|
{
|
||||||
|
if (gadget instanceof MorphWither)
|
||||||
|
{
|
||||||
|
((MorphWither)gadget).setWitherData(text, health);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user