TotalFreedomMC/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TotalFreedomMod.git synced 2024-06-02 09:51:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix players being marked as an impostor when the Discord verification system is disabled

Browse source
This commit is contained in:
Telesphoreo 2020-11-08 20:05:54 -06:00
parent 11984bc46f
commit 9a7cc52e03
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/me/totalfreedom/totalfreedommod/command/Command_manuallyverify.java
View file

@ -33,7 +33,7 @@ public class Command_manuallyverify extends FreedomCommand
return true;
}
if (!plugin.pl.isImposter(player))
if (!plugin.pl.IsImpostor(player))
{
msg("That player is not an impostor.");
return true;

4
src/main/java/me/totalfreedom/totalfreedommod/command/Command_verify.java
View file

@ -29,7 +29,7 @@ public class Command_verify extends FreedomCommand
return true;
}
if (!plugin.pl.isImposter(playerSender))
if (!plugin.pl.IsImpostor(playerSender))
{
msg("You are not an impostor, therefore you do not need to verify.", ChatColor.RED);
return true;
@ -57,7 +57,7 @@ public class Command_verify extends FreedomCommand
String code = args[0];
String backupCode = null;
if (plugin.pl.isImposter(playerSender))
if (plugin.pl.IsImpostor(playerSender))
{
PlayerData mapPlayer = plugin.dc.getVerificationCodes().get(code);
if (mapPlayer == null)

5
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
View file

@ -156,12 +156,13 @@ public class PlayerList extends FreedomService
public Boolean isPlayerImpostor(Player player)
{
PlayerData playerData = getData(player);
return !plugin.sl.isStaff(player)
return plugin.dc.enabled
&& !plugin.sl.isStaff(player)
&& (playerData.hasVerification())
&& !playerData.getIps().contains(FUtil.getIp(player));
}
public boolean isImposter(Player player)
public boolean IsImpostor(Player player)
{
return isPlayerImpostor(player) || plugin.sl.isStaffImpostor(player);
}