removing some unneeded stuff and fixing tag overlaying
This commit is contained in:
parent
e969e1adeb
commit
9010b8bfe9
@ -7,6 +7,8 @@ import java.util.HashSet;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.Map.Entry;
|
import java.util.Map.Entry;
|
||||||
|
|
||||||
|
import mineplex.core.common.util.UtilEnt;
|
||||||
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
import net.minecraft.server.v1_7_R4.DataWatcher;
|
import net.minecraft.server.v1_7_R4.DataWatcher;
|
||||||
import net.minecraft.server.v1_7_R4.Packet;
|
import net.minecraft.server.v1_7_R4.Packet;
|
||||||
import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity;
|
import net.minecraft.server.v1_7_R4.PacketPlayOutAttachEntity;
|
||||||
@ -23,9 +25,6 @@ import org.bukkit.entity.Entity;
|
|||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.util.Vector;
|
import org.bukkit.util.Vector;
|
||||||
|
|
||||||
import mineplex.core.common.util.UtilEnt;
|
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
|
|
||||||
public class Hologram
|
public class Hologram
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1,36 +1,29 @@
|
|||||||
package nautilus.game.arcade.game.games.typewars;
|
package nautilus.game.arcade.game.games.typewars;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
|
||||||
import mineplex.core.common.util.UtilEnt;
|
import mineplex.core.common.util.UtilEnt;
|
||||||
import mineplex.core.common.util.UtilFirework;
|
import mineplex.core.common.util.UtilFirework;
|
||||||
import mineplex.core.common.util.UtilMath;
|
import mineplex.core.common.util.UtilMath;
|
||||||
import mineplex.core.common.util.UtilParticle;
|
import mineplex.core.common.util.UtilParticle;
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
import mineplex.core.common.util.UtilParticle.ParticleType;
|
import mineplex.core.common.util.UtilParticle.ParticleType;
|
||||||
import mineplex.core.common.util.UtilParticle.ViewDist;
|
import mineplex.core.common.util.UtilParticle.ViewDist;
|
||||||
import mineplex.core.common.util.UtilServer;
|
import mineplex.core.common.util.UtilServer;
|
||||||
import mineplex.core.disguise.disguises.DisguiseBase;
|
import mineplex.core.disguise.disguises.DisguiseBase;
|
||||||
import mineplex.core.disguise.disguises.DisguiseCreeper;
|
|
||||||
import mineplex.core.hologram.Hologram;
|
import mineplex.core.hologram.Hologram;
|
||||||
import mineplex.core.updater.UpdateType;
|
import mineplex.core.updater.UpdateType;
|
||||||
import mineplex.core.updater.event.UpdateEvent;
|
import mineplex.core.updater.event.UpdateEvent;
|
||||||
import nautilus.game.arcade.ArcadeManager;
|
import nautilus.game.arcade.ArcadeManager;
|
||||||
import nautilus.game.arcade.game.GameTeam;
|
import nautilus.game.arcade.game.GameTeam;
|
||||||
import net.minecraft.util.com.google.common.collect.Lists;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
import org.bukkit.FireworkEffect.Type;
|
import org.bukkit.FireworkEffect.Type;
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.craftbukkit.v1_7_R4.entity.CraftEntity;
|
|
||||||
import org.bukkit.entity.Creeper;
|
import org.bukkit.entity.Creeper;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.LivingEntity;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.EventPriority;
|
import org.bukkit.event.EventPriority;
|
||||||
@ -233,7 +226,8 @@ public class Minion implements Listener
|
|||||||
{
|
{
|
||||||
if(_hologram != null)
|
if(_hologram != null)
|
||||||
{
|
{
|
||||||
_hologram.setText(_team.GetColor() + _name);
|
_hologram.setText("");
|
||||||
|
_hologram.stop();
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -252,6 +246,7 @@ public class Minion implements Listener
|
|||||||
catch (Exception e) {}
|
catch (Exception e) {}
|
||||||
_hologram = new Hologram(_manager.getHologramManager(), _entity.getLocation().add(0, 2, 0), _team.GetColor() + _name);
|
_hologram = new Hologram(_manager.getHologramManager(), _entity.getLocation().add(0, 2, 0), _team.GetColor() + _name);
|
||||||
_hologram.setHologramTarget(Hologram.HologramTarget.WHITELIST);
|
_hologram.setHologramTarget(Hologram.HologramTarget.WHITELIST);
|
||||||
|
_hologram.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void path()
|
private void path()
|
||||||
|
@ -11,11 +11,10 @@ import mineplex.core.common.util.UtilAlg;
|
|||||||
import mineplex.core.common.util.UtilEnt;
|
import mineplex.core.common.util.UtilEnt;
|
||||||
import mineplex.core.common.util.UtilMath;
|
import mineplex.core.common.util.UtilMath;
|
||||||
import mineplex.core.common.util.UtilParticle;
|
import mineplex.core.common.util.UtilParticle;
|
||||||
import mineplex.core.common.util.UtilShapes;
|
|
||||||
import mineplex.core.common.util.UtilSound;
|
|
||||||
import mineplex.core.common.util.UtilParticle.ViewDist;
|
import mineplex.core.common.util.UtilParticle.ViewDist;
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
import mineplex.core.common.util.UtilPlayer;
|
||||||
import mineplex.core.common.util.UtilServer;
|
import mineplex.core.common.util.UtilServer;
|
||||||
|
import mineplex.core.common.util.UtilShapes;
|
||||||
import mineplex.core.common.util.UtilTextBottom;
|
import mineplex.core.common.util.UtilTextBottom;
|
||||||
import mineplex.core.common.util.UtilTextMiddle;
|
import mineplex.core.common.util.UtilTextMiddle;
|
||||||
import mineplex.core.common.util.UtilTime;
|
import mineplex.core.common.util.UtilTime;
|
||||||
@ -39,11 +38,8 @@ import nautilus.game.arcade.game.games.typewars.stats.PerfectionistStatTracker;
|
|||||||
import nautilus.game.arcade.game.games.typewars.stats.WaitForItStatTracker;
|
import nautilus.game.arcade.game.games.typewars.stats.WaitForItStatTracker;
|
||||||
import nautilus.game.arcade.kit.Kit;
|
import nautilus.game.arcade.kit.Kit;
|
||||||
import nautilus.game.arcade.world.WorldData;
|
import nautilus.game.arcade.world.WorldData;
|
||||||
import net.minecraft.server.v1_7_R4.DataWatcher;
|
|
||||||
import net.minecraft.server.v1_7_R4.PacketPlayOutEntityMetadata;
|
|
||||||
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Sound;
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -318,10 +314,8 @@ public class TypeWars extends TeamGame
|
|||||||
}
|
}
|
||||||
|
|
||||||
Hologram hologram = minion.getHologram();
|
Hologram hologram = minion.getHologram();
|
||||||
double yAdd = UtilPlayer.is1_8(player) ? 2.18 : 2.3;
|
hologram.setLocation(minion.getEntity().getLocation().add(0, minion.getType().getTagHight() + 2.3, 0));
|
||||||
hologram.setLocation(minion.getEntity().getLocation().add(0, minion.getType().getTagHight() + yAdd, 0));
|
|
||||||
hologram.addPlayer(player);
|
hologram.addPlayer(player);
|
||||||
hologram.start();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,12 +1,7 @@
|
|||||||
package nautilus.game.arcade.game.games.typewars.kits;
|
package nautilus.game.arcade.game.games.typewars.kits;
|
||||||
|
|
||||||
import jdk.nashorn.internal.ir.GetSplitState;
|
|
||||||
import mineplex.core.common.util.C;
|
import mineplex.core.common.util.C;
|
||||||
import mineplex.core.common.util.F;
|
|
||||||
import mineplex.core.common.util.UtilPlayer;
|
|
||||||
import mineplex.core.itemstack.ItemStackFactory;
|
import mineplex.core.itemstack.ItemStackFactory;
|
||||||
import mineplex.core.updater.UpdateType;
|
|
||||||
import mineplex.core.updater.event.UpdateEvent;
|
|
||||||
import nautilus.game.arcade.ArcadeManager;
|
import nautilus.game.arcade.ArcadeManager;
|
||||||
import nautilus.game.arcade.game.games.typewars.MinionType;
|
import nautilus.game.arcade.game.games.typewars.MinionType;
|
||||||
import nautilus.game.arcade.game.games.typewars.Spell;
|
import nautilus.game.arcade.game.games.typewars.Spell;
|
||||||
|
@ -3,7 +3,6 @@ package nautilus.game.arcade.game.games.typewars.spells;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
import mineplex.core.common.util.UtilBlock;
|
|
||||||
import mineplex.core.common.util.UtilParticle.ParticleType;
|
import mineplex.core.common.util.UtilParticle.ParticleType;
|
||||||
import nautilus.game.arcade.ArcadeManager;
|
import nautilus.game.arcade.ArcadeManager;
|
||||||
import nautilus.game.arcade.game.games.typewars.Spell;
|
import nautilus.game.arcade.game.games.typewars.Spell;
|
||||||
|
Loading…
Reference in New Issue
Block a user