From 2f85d35df18c192b7cd080ca003805ae31d7eb68 Mon Sep 17 00:00:00 2001
From: libraryaddict <libraryaddict115@yahoo.co.nz>
Date: Sat, 23 Nov 2013 15:50:10 +1300
Subject: [PATCH] Fixed the wrong constructor when a self disguise is removed

---
 .../disguise/utilities/DisguiseUtilities.java      | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
index d5760152..dffc9393 100644
--- a/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
+++ b/src/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
@@ -107,8 +107,11 @@ public class DisguiseUtilities {
             try {
                 ProtocolLibrary.getProtocolManager().sendServerPacket(
                         player,
-                        ProtocolLibrary.getProtocolManager().createPacketConstructor(Packets.Server.ENTITY_METADATA, player)
-                                .createPacket(player));
+                        ProtocolLibrary
+                                .getProtocolManager()
+                                .createPacketConstructor(Packets.Server.ENTITY_METADATA, player.getEntityId(),
+                                        WrappedDataWatcher.getEntityWatcher(player), true)
+                                .createPacket(player.getEntityId(), WrappedDataWatcher.getEntityWatcher(player), true));
             } catch (Exception ex) {
                 ex.printStackTrace();
             }
@@ -206,13 +209,6 @@ public class DisguiseUtilities {
                                 loc.getBlockY(), loc.getBlockZ()).createPacket(player, 0, loc.getBlockX(), loc.getBlockY(),
                                 loc.getBlockZ()));
             }
-            // TODO Fix this cos it doesn't move the disguise?
-            byte yaw = (byte) (loc.getYaw() * 256.0F / 360.0F);
-            byte pitch = (byte) (loc.getPitch() * 256.0F / 360.0F);
-            manager.sendServerPacket(
-                    player,
-                    manager.createPacketConstructor(Packets.Server.ENTITY_LOOK, player.getEntityId(), yaw, pitch).createPacket(
-                            player.getEntityId(), yaw, pitch));
 
             // Resend any active potion effects
             Iterator iterator = player.getActivePotionEffects().iterator();