Another small fix

This commit is contained in:
libraryaddict 2017-03-30 01:34:42 +13:00
parent d83d7fa04e
commit 1a3dc50787

View File

@ -1118,9 +1118,10 @@ public class DisguiseUtilities {
Scoreboard scoreboard = player.getScoreboard(); Scoreboard scoreboard = player.getScoreboard();
Team prevTeam = scoreboard.getEntryTeam(player.getName()); Team prevTeam = scoreboard.getEntryTeam(player.getName());
Team ldTeam = null; Team ldTeam = null;
String ldTeamName = "LD Pushing";
// If the player is in a team already // If the player is in a team already
if (prevTeam != null) { if (prevTeam != null && !prevTeam.getName().equals("LD Pushing")) {
// If we're creating a scoreboard // If we're creating a scoreboard
if (pOption == DisguisePushing.CREATE_SCOREBOARD) { if (pOption == DisguisePushing.CREATE_SCOREBOARD) {
// Remember his old team so we can give him it back later // Remember his old team so we can give him it back later
@ -1129,10 +1130,10 @@ public class DisguiseUtilities {
// We're modifying the scoreboard // We're modifying the scoreboard
ldTeam = prevTeam; ldTeam = prevTeam;
} }
} else {
prevTeam = null;
} }
String ldTeamName = "LD Pushing";
// If we are creating a new scoreboard because the current one must not be modified // If we are creating a new scoreboard because the current one must not be modified
if (pOption == DisguisePushing.CREATE_SCOREBOARD) { if (pOption == DisguisePushing.CREATE_SCOREBOARD) {
// If they have a team, we'll reuse that name. Otherwise go for another name // If they have a team, we'll reuse that name. Otherwise go for another name