Remove team metadata

CitizensDev · Aug 9, 2020 · 21b2908 · 21b2908
1 parent d9762be
commit 21b2908
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/EventListen.java b/main/src/main/java/net/citizensnpcs/EventListen.java
@@ -427,11 +427,14 @@ public void onNPCDespawn(NPCDespawnEvent event) {
         if (!Setting.USE_SCOREBOARD_TEAMS.asBoolean())
             return;
         String teamName = event.getNPC().data().get(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA, "");
-        if (teamName.isEmpty() || !(event.getNPC() instanceof Player))
+        if (teamName.isEmpty())
             return;
-        Player player = (Player) event.getNPC().getEntity();
         Team team = Util.getDummyScoreboard().getTeam(teamName);
-        if (team != null && team.hasPlayer(player)) {
+        event.getNPC().data().remove(NPC.SCOREBOARD_FAKE_TEAM_NAME_METADATA);
+        if (team == null || !(event.getNPC().getEntity() instanceof Player))
+            return;
+        Player player = (Player) event.getNPC().getEntity();
+        if (team.hasPlayer(player)) {
             if (team.getSize() == 1) {
                 Util.sendTeamPacketToOnlinePlayers(team, 1);
                 team.unregister();