From b68cb7c2eae594729569068b92d51c2516f34725 Mon Sep 17 00:00:00 2001
From: MrMicky <themrmicky@gmail.com>
Date: Sun, 22 Apr 2018 20:33:35 +0200
Subject: [PATCH] Remove collisions with NPC on 1.9+ servers

---
 .../v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java    | 2 ++
 .../v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java    | 2 ++
 .../v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java    | 2 ++
 .../nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java | 2 ++
 .../nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/src/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/src/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
index 1bc7b21..9d66c1f 100644
--- a/src/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_10_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
@@ -25,6 +25,8 @@ public class PacketPlayOutScoreboardTeamWrapper {
                 .set(packetPlayOutScoreboardTeam, name);
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "e", String.class)
                 .set(packetPlayOutScoreboardTeam, "never");
+        Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "f", String.class)
+                .set(packetPlayOutScoreboardTeam, "never");
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class)
                 .set(packetPlayOutScoreboardTeam, 0);
         Reflection.FieldAccessor<Collection> collectionFieldAccessor = Reflection.getField(
diff --git a/src/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/src/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
index 0b88683..72f6f3b 100644
--- a/src/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_11_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
@@ -25,6 +25,8 @@ public class PacketPlayOutScoreboardTeamWrapper {
                 .set(packetPlayOutScoreboardTeam, name);
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "e", String.class)
                 .set(packetPlayOutScoreboardTeam, "never");
+        Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "f", String.class)
+                .set(packetPlayOutScoreboardTeam, "never");
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class)
                 .set(packetPlayOutScoreboardTeam, 0);
         Reflection.FieldAccessor<Collection> collectionFieldAccessor = Reflection.getField(
diff --git a/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
index d6e3a98..6a1d4a5 100644
--- a/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_12_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
@@ -25,6 +25,8 @@ public class PacketPlayOutScoreboardTeamWrapper {
                 .set(packetPlayOutScoreboardTeam, name);
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "e", String.class)
                 .set(packetPlayOutScoreboardTeam, "never");
+        Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "f", String.class)
+                .set(packetPlayOutScoreboardTeam, "never");
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class)
                 .set(packetPlayOutScoreboardTeam, 0);
         Reflection.FieldAccessor<Collection> collectionFieldAccessor = Reflection.getField(
diff --git a/src/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java b/src/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
index 5691d41..ea81eee 100644
--- a/src/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_9_R1/packets/PacketPlayOutScoreboardTeamWrapper.java
@@ -25,6 +25,8 @@ public class PacketPlayOutScoreboardTeamWrapper {
                 .set(packetPlayOutScoreboardTeam, name);
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "e", String.class)
                 .set(packetPlayOutScoreboardTeam, "never");
+        Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "f", String.class)
+                .set(packetPlayOutScoreboardTeam, "never");
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class)
                 .set(packetPlayOutScoreboardTeam, 0);
         Reflection.FieldAccessor<Collection> collectionFieldAccessor = Reflection.getField(
diff --git a/src/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java b/src/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java
index 1131d1e..38e4b3e 100644
--- a/src/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java
+++ b/src/net/jitse/npclib/nms/v1_9_R2/packets/PacketPlayOutScoreboardTeamWrapper.java
@@ -25,6 +25,8 @@ public class PacketPlayOutScoreboardTeamWrapper {
                 .set(packetPlayOutScoreboardTeam, name);
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "e", String.class)
                 .set(packetPlayOutScoreboardTeam, "never");
+        Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "f", String.class)
+                .set(packetPlayOutScoreboardTeam, "never");
         Reflection.getField(packetPlayOutScoreboardTeam.getClass(), "i", int.class)
                 .set(packetPlayOutScoreboardTeam, 0);
         Reflection.FieldAccessor<Collection> collectionFieldAccessor = Reflection.getField(