From 782e5925b14653b0855c6346a7f9fd71060ba4b5 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Mon, 25 Nov 2013 16:52:09 +1300 Subject: [PATCH] Removed item frame disguise as it cannot move and is effectively useless --- .../disguise/disguisetypes/Disguise.java | 2 +- .../disguise/disguisetypes/DisguiseType.java | 2 +- .../disguise/utilities/PacketsManager.java | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java index 6fe28872..7e3293d7 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/Disguise.java +++ b/src/me/libraryaddict/disguise/disguisetypes/Disguise.java @@ -139,7 +139,7 @@ public abstract class Disguise { case ENDER_CRYSTAL: case ENDER_DRAGON: case GHAST: - case ITEM_FRAME: + // case ITEM_FRAME: case MINECART: case MINECART_CHEST: case MINECART_FURNACE: diff --git a/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java b/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java index 911a2a95..f98af161 100644 --- a/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java +++ b/src/me/libraryaddict/disguise/disguisetypes/DisguiseType.java @@ -54,7 +54,7 @@ public enum DisguiseType { IRON_GOLEM(), - ITEM_FRAME(71), + // ITEM_FRAME(71), LEASH_HITCH(77), diff --git a/src/me/libraryaddict/disguise/utilities/PacketsManager.java b/src/me/libraryaddict/disguise/utilities/PacketsManager.java index 83aa8ced..13be7e84 100644 --- a/src/me/libraryaddict/disguise/utilities/PacketsManager.java +++ b/src/me/libraryaddict/disguise/utilities/PacketsManager.java @@ -265,11 +265,11 @@ public class PacketsManager { // But if someone constructing the disguise uses it properly. It will work. if (disguise.getType() == DisguiseType.FISHING_HOOK) data = disguise.getEntity().getEntityId(); - else if (disguise.getType() == DisguiseType.ITEM_FRAME) { - data = (int) loc.getYaw(); - if (data < 0) - data = -data; - } + /* else if (disguise.getType() == DisguiseType.ITEM_FRAME) { + data = (int) loc.getYaw(); + if (data < 0) + data = -data; + }*/ spawnPackets[0] = ProtocolLibrary.getProtocolManager() .createPacketConstructor(Packets.Server.VEHICLE_SPAWN, nmsEntity, id, data).createPacket(nmsEntity, id, data); spawnPackets[0].getModifier().write(2, (int) Math.floor(loc.getY() * 32D)); @@ -359,7 +359,7 @@ public class PacketsManager { case WITHER_SKULL: value -= 128; break; - case ITEM_FRAME: + // case ITEM_FRAME: case ARROW: value = (byte) -value; break; @@ -385,7 +385,7 @@ public class PacketsManager { case WITHER_SKULL: value += 128; break; - case ITEM_FRAME: + // case ITEM_FRAME: case ARROW: value = (byte) -value; break;