From 3228ba65aece7949cf325f7133ea3746e8f3edb8 Mon Sep 17 00:00:00 2001
From: Myles <myles@myles.us>
Date: Tue, 20 Dec 2016 20:13:19 +0000
Subject: [PATCH] Fix #587

---
 .../ViaVersion/bungee/listeners/MainHandPatch.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/bungee/src/main/java/us/myles/ViaVersion/bungee/listeners/MainHandPatch.java b/bungee/src/main/java/us/myles/ViaVersion/bungee/listeners/MainHandPatch.java
index 7d7a5e0ce..709df56f4 100644
--- a/bungee/src/main/java/us/myles/ViaVersion/bungee/listeners/MainHandPatch.java
+++ b/bungee/src/main/java/us/myles/ViaVersion/bungee/listeners/MainHandPatch.java
@@ -29,16 +29,20 @@ public class MainHandPatch implements Listener {
     @EventHandler
     public void onServerConnect(ServerConnectEvent event) {
         // Ignore if it doesn't exist (Like BungeeCord 1.8)
-        if (setMainHand == null)
+        if (setMainHand == null || getSettings == null)
             return;
 
         UserConnection user = Via.getManager().getConnection(event.getPlayer().getUniqueId());
-        if(user == null) return;
-        
+        if (user == null) return;
+
         try {
             if (user.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) {
                 Object settings = getSettings.invoke(event.getPlayer());
-                setMainHand.invoke(settings, user.get(EntityTracker.class).getMainHand());
+                if (settings != null) {
+                    if (user.has(EntityTracker.class)) {
+                        setMainHand.invoke(settings, user.get(EntityTracker.class).getMainHand());
+                    }
+                }
             }
         } catch (Exception e) {
             e.printStackTrace();