diff --git a/config.yml b/config.yml index fbb0eb7b..07c64f92 100644 --- a/config.yml +++ b/config.yml @@ -103,7 +103,7 @@ PacketsEnabled: Collect: true # This disables a fix for when a disguised entity wearing armor dies, if the disguise can wear armor. It drops unpickupable items to anyone watching. EntityStatus: true - # Entity enquipment is the packets that are sent to ensure that a disguise has or doesn't have armor, and their held item. + # Entity equipment is the packets that are sent to ensure that a disguise has or doesn't have armor, and their held item. # Disabling this means that any disguises which can wear armor or hold items will show the armor/held item that the disguised is wearing. Enquipment: true # This doesn't actually disable the packet. It would introduce problems. Instead it does the next best thing and caches the data. diff --git a/src/me/libraryaddict/disguise/DisguiseAPI.java b/src/me/libraryaddict/disguise/DisguiseAPI.java index 9ef013fc..293435e3 100644 --- a/src/me/libraryaddict/disguise/DisguiseAPI.java +++ b/src/me/libraryaddict/disguise/DisguiseAPI.java @@ -42,7 +42,7 @@ public class DisguiseAPI { return constructDisguise(entity, true, true, true); } - public static Disguise constructDisguise(Entity entity, boolean doEnquipment, boolean doSneak, boolean doSprint) { + public static Disguise constructDisguise(Entity entity, boolean doEquipment, boolean doSneak, boolean doSprint) { DisguiseType disguiseType = DisguiseType.getType(entity); Disguise disguise; if (disguiseType.isMisc()) { @@ -64,10 +64,10 @@ public class DisguiseAPI { if (entity.getFireTicks() > 0) { watcher.setBurning(true); } - if (doEnquipment && entity instanceof LivingEntity) { - EntityEquipment enquip = ((LivingEntity) entity).getEquipment(); - watcher.setArmor(enquip.getArmorContents()); - watcher.setItemInHand(enquip.getItemInHand()); + if (doEquipment && entity instanceof LivingEntity) { + EntityEquipment equip = ((LivingEntity) entity).getEquipment(); + watcher.setArmor(equip.getArmorContents()); + watcher.setItemInHand(equip.getItemInHand()); if (disguiseType.getEntityType() == EntityType.HORSE) { Horse horse = (Horse) entity; HorseInventory horseInventory = horse.getInventory(); diff --git a/src/me/libraryaddict/disguise/DisguiseConfig.java b/src/me/libraryaddict/disguise/DisguiseConfig.java index de7074e4..61020c52 100644 --- a/src/me/libraryaddict/disguise/DisguiseConfig.java +++ b/src/me/libraryaddict/disguise/DisguiseConfig.java @@ -14,7 +14,7 @@ public class DisguiseConfig { private static String disguiseBlownMessage; private static int disguiseCloneExpire; private static int disguiseEntityExpire; - private static boolean enquipmentEnabled; + private static boolean equipmentEnabled; private static boolean entityAnimationsAdded; private static boolean entityStatusEnabled; private static boolean hearSelfDisguise; @@ -105,9 +105,13 @@ public class DisguiseConfig { return blowDisguisesOnAttack; } - public static boolean isEnquipmentPacketsEnabled() { - return enquipmentEnabled; + public static boolean isEquipmentPacketsEnabled() { + return equipmentEnabled; } + /** + * @deprecated Spelling mistake. + */ + @Deprecated public static boolean isEnquipmentPacketsEnabled() { return equipmentEnabled; } public static boolean isEntityAnimationsAdded() { return entityAnimationsAdded; @@ -262,8 +266,8 @@ public class DisguiseConfig { } public static void setEnquipmentPacketsEnabled(boolean enabled) { - if (enabled != isEnquipmentPacketsEnabled()) { - enquipmentEnabled = enabled; + if (enabled != isEquipmentPacketsEnabled()) { + equipmentEnabled = enabled; PacketsManager.setupMainPacketsListener(); } } diff --git a/src/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/me/libraryaddict/disguise/utilities/PacketsManager.java index b50c9c2f..806f23b8 100644 --- a/src/me/libraryaddict/disguise/utilities/PacketsManager.java +++ b/src/me/libraryaddict/disguise/utilities/PacketsManager.java @@ -120,7 +120,7 @@ public class PacketsManager { ArrayList packets = new ArrayList(); // This sends the armor packets so that the player isn't naked. // Please note it only sends the packets that wouldn't be sent normally - if (DisguiseConfig.isEnquipmentPacketsEnabled()) { + if (DisguiseConfig.isEquipmentPacketsEnabled()) { for (int nmsSlot = 0; nmsSlot < 5; nmsSlot++) { int armorSlot = nmsSlot - 1; if (armorSlot < 0) @@ -1126,8 +1126,8 @@ public class PacketsManager { packetsToListen.add(PacketType.Play.Server.ENTITY_HEAD_ROTATION); packetsToListen.add(PacketType.Play.Server.ENTITY_TELEPORT); } - // Add enquipment packet - if (DisguiseConfig.isEnquipmentPacketsEnabled()) { + // Add equipment packet + if (DisguiseConfig.isEquipmentPacketsEnabled()) { packetsToListen.add(PacketType.Play.Server.ENTITY_EQUIPMENT); } // Add the packet that ensures if they are sleeping or not