SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Check for null role.

Browse Source 
Resolves: #1047 #1048 #1041
This commit is contained in:
Trent Hensler 2018-03-01 22:15:44 -08:00
parent c4a56de3b7
commit 6cb02126f4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/massivecraft/factions/util/MiscUtil.java
View File

@ -3,6 +3,7 @@ package com.massivecraft.factions.util;
import com.massivecraft.factions.Conf; import com.massivecraft.factions.Conf;
import com.massivecraft.factions.FPlayer; import com.massivecraft.factions.FPlayer;
import com.massivecraft.factions.P; import com.massivecraft.factions.P;
import com.massivecraft.factions.struct.Role;
import com.massivecraft.factions.zcore.util.TL; import com.massivecraft.factions.zcore.util.TL;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Creature; import org.bukkit.entity.Creature;
@ -13,6 +14,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.logging.Level;
public class MiscUtil { public class MiscUtil {
@ -88,6 +90,13 @@ public class MiscUtil {
List<FPlayer> recruit = new ArrayList<>(); List<FPlayer> recruit = new ArrayList<>();
for (FPlayer player : players) { for (FPlayer player : players) {
// Fix for some data being broken when we added the recruit rank.
if (player.getRole() == null) {
player.setRole(Role.NORMAL);
P.p.log(Level.WARNING, String.format("Player %s had null role. Setting them to normal. This isn't good D:", player.getName()));
}
switch (player.getRole()) { switch (player.getRole()) {
case ADMIN: case ADMIN:
admins.add(player); admins.add(player);