From 7196a23d5749391f411099df7f1b3071cf6ddda9 Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 13:12:54 +0100 Subject: [PATCH 01/10] Command spy will now store status and automatically enable if appropriate. Resolves #785 --- .../totalfreedommod/CommandSpy.java | 23 +++++++++++++++++ .../totalfreedommod/LoginProcess.java | 11 +++++++- .../totalfreedommod/admin/Admin.java | 11 +++++++- .../totalfreedommod/admin/AdminList.java | 25 +++++++++++++++++++ .../command/Command_cmdspy.java | 8 ++++++ 5 files changed, 76 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index d90cf4f17..cabcd754a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -1,10 +1,12 @@ package me.totalfreedom.totalfreedommod; +import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerCommandPreprocessEvent; +import org.bukkit.event.player.PlayerJoinEvent; public class CommandSpy extends FreedomService { @@ -41,4 +43,25 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) } } + @EventHandler(priority = EventPriority.MONITOR) + public void onPlayerJoin(PlayerJoinEvent event) + { + if (plugin.al.isAdmin(event.getPlayer())) + { + if (plugin.al.isCommandSpyActive(event.getPlayer())) + { + FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); + playerdata.setCommandSpy(playerdata.cmdspyEnabled() == true); + } else + { + FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); + playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); + } + } else + { + FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); + playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); + } + } + } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 9efa98e3f..4c2b94518 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -144,6 +144,15 @@ public void onPlayerLogin(PlayerLoginEvent event) } return; + } + + // Command Spy Retaining Status + + if (isAdmin) // Player is superadmin + { + + + } // Player is not an admin @@ -196,7 +205,7 @@ public void run() if (lockdownEnabled) { - FUtil.playerMsg(player, "Warning: Server is currenty in lockdown-mode, new players will not be able to join!", ChatColor.RED); + FUtil.playerMsg(player, "Warning: Server is currently in lockdown-mode, new players will not be able to join!", ChatColor.RED); } } }.runTaskLater(plugin, 20L * 1L); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index b27625b4f..fba18db6e 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -38,6 +38,9 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable @Getter @Setter private String loginMessage = null; + @Getter + @Setter + private boolean commandSpyStatus = true; public Admin(Player player) { @@ -61,7 +64,8 @@ public String toString() .append("- Last Login: ").append(FUtil.dateToString(lastLogin)).append("\n") .append("- Custom Login Message: ").append(loginMessage).append("\n") .append("- Rank: ").append(rank.getName()).append("\n") - .append("- Is Active: ").append(active); + .append("- Is Active: ").append(active).append("\n") + .append("- CommandSpy Active: ").append(commandSpyStatus); return output.toString(); } @@ -96,6 +100,7 @@ public void saveTo(ConfigurationSection cs) cs.set("ips", Lists.newArrayList(ips)); cs.set("last_login", FUtil.dateToString(lastLogin)); cs.set("login_message", loginMessage); + cs.set("commandspy_isactive", commandspystatus); } public boolean isAtLeast(Rank pRank) @@ -108,6 +113,10 @@ public boolean hasLoginMessage() return loginMessage != null && !loginMessage.isEmpty(); } + public boolean commandSpyIsActive{ + return commandSpyStatus +} + // Util IP methods public void addIp(String ip) { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java index b40bca8ee..e055dd315 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java @@ -238,6 +238,31 @@ public boolean isAdminImpostor(Player player) return getEntryByName(player.getName()) != null && !isAdmin(player); } + public boolean isCommandSpyActive(Player player){ + final Admin admin = getAdmin(player); + if(admin.commandSpyIsActive) + { + return true; + } + else + { + return false; + } + } + + public boolean setCommandSpyActive(boolean status, Player player){ + final Admin admin = getAdmin(player); + + if (status == true) + { + admin.commandSpyIsActive = true; + } + else{ + admin.commandSpyIsActive = false; + } + } + + public boolean isIdentityMatched(Player player) { if (Bukkit.getOnlineMode()) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index c316a46ae..d802d34d1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -17,6 +17,14 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin FPlayer playerdata = plugin.pl.getPlayer(playerSender); playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); + if (playerdata.cmdspyEnabled() == true) + { + plugin.al.setCommandSpyActive(true, playerSender); + } else + { + plugin.al.setCommandSpyActive(false, playerSender); + } + msg("CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled.")); return true; From 6fb3bb3bc874a5242ebb4bd055d474579020aaed Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 13:14:15 +0100 Subject: [PATCH 02/10] Removed mistaken statement that had been left --- .../me/totalfreedom/totalfreedommod/LoginProcess.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java index 4c2b94518..6f3f1d8ca 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java @@ -144,15 +144,6 @@ public void onPlayerLogin(PlayerLoginEvent event) } return; - } - - // Command Spy Retaining Status - - if (isAdmin) // Player is superadmin - { - - - } // Player is not an admin From 5f6331c3c14a21af2653db423659f8bc296ce80b Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:30:33 +0100 Subject: [PATCH 03/10] Resolved all issued that had been missed before --- .../totalfreedom/totalfreedommod/CommandSpy.java | 8 +++++--- .../totalfreedom/totalfreedommod/admin/Admin.java | 12 ++++++++---- .../totalfreedommod/admin/AdminList.java | 15 ++++++++++----- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index cabcd754a..09ab6ed6d 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -51,13 +51,15 @@ public void onPlayerJoin(PlayerJoinEvent event) if (plugin.al.isCommandSpyActive(event.getPlayer())) { FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); - playerdata.setCommandSpy(playerdata.cmdspyEnabled() == true); - } else + playerdata.setCommandSpy(playerdata.cmdspyEnabled()); + } + else { FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); } - } else + } + else { FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index fba18db6e..ea678d8b1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -1,8 +1,10 @@ package me.totalfreedom.totalfreedommod.admin; import com.google.common.collect.Lists; + import java.util.Date; import java.util.List; + import lombok.Getter; import lombok.Setter; import me.totalfreedom.totalfreedommod.rank.Rank; @@ -100,7 +102,7 @@ public void saveTo(ConfigurationSection cs) cs.set("ips", Lists.newArrayList(ips)); cs.set("last_login", FUtil.dateToString(lastLogin)); cs.set("login_message", loginMessage); - cs.set("commandspy_isactive", commandspystatus); + cs.set("commandspy_isactive", commandSpyStatus); } public boolean isAtLeast(Rank pRank) @@ -113,9 +115,11 @@ public boolean hasLoginMessage() return loginMessage != null && !loginMessage.isEmpty(); } - public boolean commandSpyIsActive{ - return commandSpyStatus -} + public boolean commandSpyIsActive() + + { + return commandSpyStatus; + } // Util IP methods public void addIp(String ip) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java index e055dd315..ae3f8658c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java @@ -3,10 +3,12 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; import com.google.common.collect.Sets; + import java.util.Date; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; + import lombok.Getter; import me.totalfreedom.totalfreedommod.FreedomService; import me.totalfreedom.totalfreedommod.TotalFreedomMod; @@ -238,9 +240,10 @@ public boolean isAdminImpostor(Player player) return getEntryByName(player.getName()) != null && !isAdmin(player); } - public boolean isCommandSpyActive(Player player){ + public boolean isCommandSpyActive(Player player) + { final Admin admin = getAdmin(player); - if(admin.commandSpyIsActive) + if (admin.commandSpyIsActive) { return true; } @@ -250,14 +253,16 @@ public boolean isCommandSpyActive(Player player){ } } - public boolean setCommandSpyActive(boolean status, Player player){ + public boolean setCommandSpyActive(boolean status, Player player) + { final Admin admin = getAdmin(player); - if (status == true) + if (status) { admin.commandSpyIsActive = true; } - else{ + else + { admin.commandSpyIsActive = false; } } From c52f4a679ac15fd548f7dbdbb45929db494ba0be Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:31:49 +0100 Subject: [PATCH 04/10] Missed a file... Whoops thats fixed now --- .../totalfreedom/totalfreedommod/command/Command_cmdspy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index d802d34d1..8e906e9e8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -17,10 +17,11 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin FPlayer playerdata = plugin.pl.getPlayer(playerSender); playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); - if (playerdata.cmdspyEnabled() == true) + if (playerdata.cmdspyEnabled()) { plugin.al.setCommandSpyActive(true, playerSender); - } else + } + else { plugin.al.setCommandSpyActive(false, playerSender); } From e4f3b525c26d4c9594a3f8532f5a3ed64c6c6ed7 Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 14:37:20 +0100 Subject: [PATCH 05/10] Removed additional whitespace --- src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index ea678d8b1..a539e746b 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -116,7 +116,6 @@ public boolean hasLoginMessage() } public boolean commandSpyIsActive() - { return commandSpyStatus; } From 091bb83b01b51abc14302b12d067e36ae940ef6a Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 15:02:49 +0100 Subject: [PATCH 06/10] Cleaned up the way getting and setting command spy works --- .../totalfreedommod/CommandSpy.java | 10 ++++--- .../totalfreedommod/admin/Admin.java | 17 +++++++---- .../totalfreedommod/admin/AdminList.java | 28 ------------------- .../command/Command_cmdspy.java | 7 +++-- 4 files changed, 22 insertions(+), 40 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index 09ab6ed6d..7497be003 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -1,5 +1,6 @@ package me.totalfreedom.totalfreedommod; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.entity.Player; @@ -46,22 +47,23 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event) { + Admin admin = getAdmin((Player) event.getPlayer()); + FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); + if (plugin.al.isAdmin(event.getPlayer())) { - if (plugin.al.isCommandSpyActive(event.getPlayer())) + if (admin.hasCommandSpy()) { - FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); + playerdata.setCommandSpy(playerdata.cmdspyEnabled()); } else { - FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); } } else { - FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer()); playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false); } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index a539e746b..682bbbc38 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -42,7 +42,7 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable private String loginMessage = null; @Getter @Setter - private boolean commandSpyStatus = true; + private Boolean commandSpy = true; public Admin(Player player) { @@ -67,7 +67,7 @@ public String toString() .append("- Custom Login Message: ").append(loginMessage).append("\n") .append("- Rank: ").append(rank.getName()).append("\n") .append("- Is Active: ").append(active).append("\n") - .append("- CommandSpy Active: ").append(commandSpyStatus); + .append("- CommandSpy: ").append(commandSpy); return output.toString(); } @@ -102,7 +102,7 @@ public void saveTo(ConfigurationSection cs) cs.set("ips", Lists.newArrayList(ips)); cs.set("last_login", FUtil.dateToString(lastLogin)); cs.set("login_message", loginMessage); - cs.set("commandspy_isactive", commandSpyStatus); + cs.set("commandspy", commandSpy); } public boolean isAtLeast(Rank pRank) @@ -115,9 +115,14 @@ public boolean hasLoginMessage() return loginMessage != null && !loginMessage.isEmpty(); } - public boolean commandSpyIsActive() + public Boolean hasCommandSpy() { - return commandSpyStatus; + return commandSpy; + } + + public Boolean setCommandSpy(boolean commandSpyStatus) + { + commandSpy = commandSpyStatus; } // Util IP methods @@ -159,4 +164,4 @@ public boolean isValid() && !ips.isEmpty() && lastLogin != null; } -} +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java index ae3f8658c..edcb3715a 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java @@ -240,34 +240,6 @@ public boolean isAdminImpostor(Player player) return getEntryByName(player.getName()) != null && !isAdmin(player); } - public boolean isCommandSpyActive(Player player) - { - final Admin admin = getAdmin(player); - if (admin.commandSpyIsActive) - { - return true; - } - else - { - return false; - } - } - - public boolean setCommandSpyActive(boolean status, Player player) - { - final Admin admin = getAdmin(player); - - if (status) - { - admin.commandSpyIsActive = true; - } - else - { - admin.commandSpyIsActive = false; - } - } - - public boolean isIdentityMatched(Player player) { if (Bukkit.getOnlineMode()) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index 8e906e9e8..19eb05342 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -1,5 +1,6 @@ package me.totalfreedom.totalfreedommod.command; +import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.player.FPlayer; import me.totalfreedom.totalfreedommod.rank.Rank; import org.bukkit.command.Command; @@ -15,15 +16,17 @@ public class Command_cmdspy extends FreedomCommand public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { + Admin admin = getAdmin((Player) sender); FPlayer playerdata = plugin.pl.getPlayer(playerSender); playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); if (playerdata.cmdspyEnabled()) { - plugin.al.setCommandSpyActive(true, playerSender); + admin.setCommandSpy(true); + } else { - plugin.al.setCommandSpyActive(false, playerSender); + admin.setCommandSpy(false); } msg("CommandSpy " + (playerdata.cmdspyEnabled() ? "enabled." : "disabled.")); From 2d5e15201c2a96c05f2424b361e60acbac6f2f66 Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 15:06:28 +0100 Subject: [PATCH 07/10] Removed additional whitespace --- src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java | 2 +- .../me/totalfreedom/totalfreedommod/command/Command_cmdspy.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index 7497be003..5d1babf10 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -44,6 +44,7 @@ public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) } } + // This will check if the user joining has command spy enabled, and if they are an admin. If they are not an admin it will ensure their command spy access has been removed, and if they are it will check to see if the admin has left command spy enabled or not on previous use. @EventHandler(priority = EventPriority.MONITOR) public void onPlayerJoin(PlayerJoinEvent event) { @@ -54,7 +55,6 @@ public void onPlayerJoin(PlayerJoinEvent event) { if (admin.hasCommandSpy()) { - playerdata.setCommandSpy(playerdata.cmdspyEnabled()); } else diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index 19eb05342..302a847e1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -15,14 +15,12 @@ public class Command_cmdspy extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - Admin admin = getAdmin((Player) sender); FPlayer playerdata = plugin.pl.getPlayer(playerSender); playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); if (playerdata.cmdspyEnabled()) { admin.setCommandSpy(true); - } else { From 7f9e26958ac3114000c19a215882a14214cbcaee Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Wed, 31 May 2017 15:24:31 +0100 Subject: [PATCH 08/10] Switched to playerSender --- .../me/totalfreedom/totalfreedommod/command/Command_cmdspy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java index 302a847e1..c046bd15c 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java @@ -15,7 +15,7 @@ public class Command_cmdspy extends FreedomCommand @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - Admin admin = getAdmin((Player) sender); + Admin admin = getAdmin(playerSender); FPlayer playerdata = plugin.pl.getPlayer(playerSender); playerdata.setCommandSpy(!playerdata.cmdspyEnabled()); if (playerdata.cmdspyEnabled()) From 7e64f6717d982da219ee21db1e3212b384691e45 Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Sun, 13 Aug 2017 14:34:33 +0100 Subject: [PATCH 09/10] Merged with devel and attempted to fix this, but cant figure out what has gone wrong --- .../me/totalfreedom/totalfreedommod/CommandSpy.java | 2 +- .../me/totalfreedom/totalfreedommod/admin/Admin.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java index 5d1babf10..28d8aac5f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java @@ -55,7 +55,7 @@ public void onPlayerJoin(PlayerJoinEvent event) { if (admin.hasCommandSpy()) { - playerdata.setCommandSpy(playerdata.cmdspyEnabled()); + playerdata.setCommandSpy(playerdata.cmdspyEnabled() == true); } else { diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index 432cbb6f0..265963d14 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -43,7 +43,7 @@ public class Admin implements ConfigLoadable, ConfigSavable, Validatable private String loginMessage = null; @Getter @Setter - private Boolean commandSpy = true; + private boolean commandSpy = true; public Admin(Player player) { @@ -116,14 +116,14 @@ public boolean hasLoginMessage() return loginMessage != null && !loginMessage.isEmpty(); } - public Boolean hasCommandSpy() + public boolean hasCommandSpy() { return commandSpy; } - public Boolean setCommandSpy(boolean commandSpyStatus) + public boolean setCommandSpy(boolean commandSpyStatus) { - commandSpy = commandSpyStatus; + return commandSpy = commandSpyStatus; } // Util IP methods @@ -185,4 +185,4 @@ public boolean isValid() && !ips.isEmpty() && lastLogin != null; } -} +} \ No newline at end of file From 49f5a3a29647cd2f4b02fd2dfa152fdb2292d946 Mon Sep 17 00:00:00 2001 From: Ryan Wild Date: Sun, 13 Aug 2017 14:36:33 +0100 Subject: [PATCH 10/10] Added new line to end of file --- src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java index 265963d14..97ed2e3c0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java @@ -185,4 +185,4 @@ public boolean isValid() && !ips.isEmpty() && lastLogin != null; } -} \ No newline at end of file +}