diff --git a/src/main/java/net/nuggetmc/ai/bot/Bot.java b/src/main/java/net/nuggetmc/ai/bot/Bot.java index ce76df1..5083cea 100644 --- a/src/main/java/net/nuggetmc/ai/bot/Bot.java +++ b/src/main/java/net/nuggetmc/ai/bot/Bot.java @@ -37,6 +37,8 @@ public class Bot extends EntityPlayer { this.velocity = new Vector(0, 0, 0); this.offset = MathUtils.circleOffset(3); + + datawatcher.set(new DataWatcherObject<>(16, DataWatcherRegistry.a), (byte) 0xFF); } public static Bot createBot(Location loc, String name, String skin) { @@ -45,11 +47,9 @@ public class Bot extends EntityPlayer { UUID uuid = SteveUUID.generate(); - CustomGameProfile profile = new CustomGameProfile(uuid, name); + CustomGameProfile profile = new CustomGameProfile(uuid, name, skin); PlayerInteractManager interactManager = new PlayerInteractManager(nmsWorld); - profile.setSkin(skin); - Bot bot = new Bot(nmsServer, nmsWorld, profile, interactManager); bot.playerConnection = new PlayerConnection(nmsServer, new NetworkManager(EnumProtocolDirection.CLIENTBOUND), bot); @@ -57,16 +57,14 @@ public class Bot extends EntityPlayer { bot.getBukkitEntity().setNoDamageTicks(0); nmsWorld.addEntity(bot); - bot.sendSpawnPackets(); + bot.renderAll(); PlayerAI.getInstance().getManager().add(bot); return bot; } - private void sendSpawnPackets() { - getDataWatcher().set(new DataWatcherObject<>(16, DataWatcherRegistry.a), (byte) 0xFF); - + private void renderAll() { for (Player player : Bukkit.getOnlinePlayers()) { PlayerConnection connection = ((CraftPlayer) player).getHandle().playerConnection; render(connection, false); @@ -130,7 +128,7 @@ public class Bot extends EntityPlayer { groundTicks = 0; } - Player botPlayer = this.getBukkitEntity(); + Player botPlayer = getBukkitEntity(); if (botPlayer.isDead()) return; double health = botPlayer.getHealth(); diff --git a/src/main/java/net/nuggetmc/ai/bot/CustomGameProfile.java b/src/main/java/net/nuggetmc/ai/bot/CustomGameProfile.java index de88b15..e77b9d7 100644 --- a/src/main/java/net/nuggetmc/ai/bot/CustomGameProfile.java +++ b/src/main/java/net/nuggetmc/ai/bot/CustomGameProfile.java @@ -8,8 +8,10 @@ import java.util.UUID; public class CustomGameProfile extends GameProfile { - public CustomGameProfile(UUID uuid, String name) { + public CustomGameProfile(UUID uuid, String name, String skin) { super(uuid, name); + + setSkin(skin); } public void setSkin(String skin) { diff --git a/src/main/java/net/nuggetmc/ai/commands/CommandHandler.java b/src/main/java/net/nuggetmc/ai/commands/CommandHandler.java index fef8f25..4e9b483 100644 --- a/src/main/java/net/nuggetmc/ai/commands/CommandHandler.java +++ b/src/main/java/net/nuggetmc/ai/commands/CommandHandler.java @@ -18,7 +18,7 @@ public class CommandHandler { public CommandHandler(PlayerAI plugin) { drink = (DrinkCommandService) Drink.get(plugin); - drink.register(new PlayerAICommand(this), "bot", "playerai", "pai", "ai", "npc"); + drink.register(new PlayerAICommand(this), "bot", "playerai", "pai", "ai", "npc", "k"); drink.registerCommands(); help = new HashMap<>(); diff --git a/src/main/java/net/nuggetmc/ai/commands/commands/PlayerAICommand.java b/src/main/java/net/nuggetmc/ai/commands/commands/PlayerAICommand.java index 450fa6f..f0f5d94 100644 --- a/src/main/java/net/nuggetmc/ai/commands/commands/PlayerAICommand.java +++ b/src/main/java/net/nuggetmc/ai/commands/commands/PlayerAICommand.java @@ -12,11 +12,8 @@ import net.nuggetmc.ai.commands.CommandInstance; import net.nuggetmc.ai.utils.ChatUtils; import org.bukkit.ChatColor; import org.bukkit.Location; -import org.bukkit.Particle; -import org.bukkit.World; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.util.Vector; import java.text.NumberFormat; import java.util.Locale;