Command Spy Persistence #2040

Wild1145 · 2017-05-31T12:17:26Z

This resolves #785

lemonsked · 2017-05-31T12:38:34Z

src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

+            {
+                FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer());
+                playerdata.setCommandSpy(playerdata.cmdspyEnabled() == true);
+            } else


Formatting.

lemonsked · 2017-05-31T12:45:06Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +113,10 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public boolean commandSpyIsActive{


Missing ()'s and { must be on next line.

lemonsked · 2017-05-31T12:45:12Z

src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

+                FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer());
+                playerdata.setCommandSpy(playerdata.cmdspyEnabled() == false);
+            }
+        } else


Formatting.

lemonsked · 2017-05-31T12:45:36Z

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

+        }
+    }
+
+    public boolean setCommandSpyActive(boolean status, Player player){


{ on next line (formatting).

lemonsked · 2017-05-31T12:46:03Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +113,10 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public boolean commandSpyIsActive{
+        return commandSpyStatus


Missing semicolon.

lemonsked · 2017-05-31T12:46:58Z

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

+        {
+            admin.commandSpyIsActive = true;
+        }
+        else{


{ on next line (formatting).

lemonsked · 2017-05-31T12:47:15Z

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java

+        if (playerdata.cmdspyEnabled() == true)
+        {
+            plugin.al.setCommandSpyActive(true, playerSender);
+        } else


else on next line.

Wild1145 · 2017-05-31T13:14:45Z

This is why you dont switch between IDE's... Whoops

lemonsked · 2017-05-31T13:27:53Z

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

+    public boolean setCommandSpyActive(boolean status, Player player){
+        final Admin admin = getAdmin(player);
+
+        if (status == true)


you can just do if(status)

lemonsked · 2017-05-31T13:28:18Z

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)


== true is unneeded

Wild1145 · 2017-05-31T13:33:45Z

@OxLemonxO There we are, mind taking a look for me now?

lemonsked · 2017-05-31T13:35:44Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +115,12 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public boolean commandSpyIsActive()
+


Extra newline for no reason

JeromSar · 2017-05-31T13:34:07Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -96,6 +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);


How about just commandspy?

JeromSar · 2017-05-31T13:34:18Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +115,12 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public boolean commandSpyIsActive()
+


Unnecessary newline.

JeromSar · 2017-05-31T13:34:42Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +115,12 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public boolean commandSpyIsActive()


Should probably be hasCommandSpy()

JeromSar · 2017-05-31T13:35:02Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -38,6 +40,9 @@
    @Getter
    @Setter
    private String loginMessage = null;
+    @Getter
+    @Setter
+    private boolean commandSpyStatus = true;


How about just commandSpy?

JeromSar · 2017-05-31T13:36:25Z

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

@@ -238,6 +240,34 @@ public boolean isAdminImpostor(Player player)
        return getEntryByName(player.getName()) != null && !isAdmin(player);
    }

+    public boolean isCommandSpyActive(Player player)


This method does to little. It is redundant and all dependent operations should probably inline any operations.

JeromSar · 2017-05-31T13:36:43Z

src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java

+        }
+    }
+
+    public boolean setCommandSpyActive(boolean status, Player player)


As noted above, this method does too little.

Wild1145 · 2017-05-31T14:03:41Z

@JeromSar Mind taking a look, I think I've found the best way now.

lemonsked · 2017-05-31T14:21:41Z

src/main/java/me/totalfreedom/totalfreedommod/command/Command_cmdspy.java

@@ -15,15 +16,17 @@
    public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
    {

+        Admin admin = getAdmin((Player) sender);


use playerSender

ghost · 2017-06-05T21:58:43Z

This is completely uneeded code? FPlayer data is stored per server session not player session now ( this isn't on the github)

mayokek · 2017-06-05T22:35:42Z

@commodore64x, then make an issue about it and a PR as all changes should be updated on GitHub

JeromSar · 2017-06-06T06:14:09Z

src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

+        Admin admin = getAdmin((Player) event.getPlayer());
+        FPlayer playerdata = plugin.pl.getPlayer(event.getPlayer());
+
+        if (plugin.al.isAdmin(event.getPlayer()))


This entire block should be changed to something like:

boolean admin = plugin.al.isAdmin(event.getPlayer(); playerdata.setCommandSpy(admin && admin.hasCommandSpy());

Given I'm struggling to understand what that even does... I will leave the PR as is for now, its already broken and needs more work, but I can't see what I've screwed up.

JeromSar · 2017-06-06T06:14:37Z

src/main/java/me/totalfreedom/totalfreedommod/CommandSpy.java

+        {
+            if (admin.hasCommandSpy())
+            {
+                playerdata.setCommandSpy(playerdata.cmdspyEnabled());


This statement does nothing. Possibly a typo.

JeromSar · 2017-06-06T06:14:51Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -38,6 +40,9 @@
    @Getter
    @Setter
    private String loginMessage = null;
+    @Getter
+    @Setter
+    private Boolean commandSpy = true;


Should be a boolean.

JeromSar · 2017-06-06T06:15:24Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -108,6 +115,16 @@ public boolean hasLoginMessage()
        return loginMessage != null && !loginMessage.isEmpty();
    }

+    public Boolean hasCommandSpy()


commandSpy does not need getters/setters. We have lombok for that.

JeromSar · 2017-06-06T06:15:38Z

src/main/java/me/totalfreedom/totalfreedommod/admin/Admin.java

@@ -147,4 +164,4 @@ public boolean isValid()
                && !ips.isEmpty()
                && lastLogin != null;
    }
-}
+}


Missing newline.

Wild1145 · 2017-06-06T15:45:08Z

I'll pull this into Netbeans soon and see whats gone wrong, IntelliJ hasnt really done a great job when I was at work by the looks of it.

As for lombok, I've never heard of that before, so might not be so helpful there.

lemonsked · 2017-08-13T13:00:23Z

Instead of making a new getter for commandspy, the annotation @Getter already created one.
You can use isCommandSpy

… has gone wrong

ghost · 2017-08-14T09:45:56Z

This isn't actually needed, there is a one line code change that will fix a vast amount of issues.

Wild1145 · 2017-08-15T18:34:27Z

@commodore64x It however is not implemented at the current time. Until such a time that it is, this does resolve a valid and approved issue.

Wild1145 added 2 commits May 31, 2017 13:12

Command spy will now store status and automatically enable if appropr…

7196a23

…iate. Resolves TotalFreedom#785

Removed mistaken statement that had been left

6fb3bb3

Wild1145 added PR: To Review PR: To Test labels May 31, 2017

lemonsked requested changes May 31, 2017

View reviewed changes

lemonsked reviewed May 31, 2017

View reviewed changes

Wild1145 added 2 commits May 31, 2017 14:30

Resolved all issued that had been missed before

5f6331c

Missed a file... Whoops thats fixed now

c52f4a6

JeromSar changed the title ~~Command Spy Persistace~~ Command Spy Persistence May 31, 2017

lemonsked reviewed May 31, 2017

View reviewed changes

lemonsked approved these changes May 31, 2017

View reviewed changes

JeromSar requested changes May 31, 2017

View reviewed changes

Wild1145 added 2 commits May 31, 2017 14:37

Removed additional whitespace

e4f3b52

Cleaned up the way getting and setting command spy works

091bb83

Removed additional whitespace

2d5e152

lemonsked reviewed May 31, 2017

View reviewed changes

Switched to playerSender

7f9e269

JeromSar changed the base branch from tfm5.1-mc1.12 to devel June 2, 2017 13:28

JeromSar requested changes Jun 6, 2017

View reviewed changes

Wild1145 added 3 commits August 13, 2017 14:06

Merge origin/devel into TFM-785

df17d22

Merged with devel and attempted to fix this, but cant figure out what…

7e64f67

… has gone wrong

Added new line to end of file

49f5a3a

Wild1145 added the PR: Needs changes label Aug 13, 2017

Command Spy Persistence #2040

Are you sure you want to change the base?

Command Spy Persistence #2040

Uh oh!

Conversation

Wild1145 commented May 31, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Wild1145 commented May 31, 2017

Uh oh!

lemonsked May 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Wild1145 commented May 31, 2017

Uh oh!

lemonsked May 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JeromSar May 31, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Wild1145 commented May 31, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ghost commented Jun 5, 2017

Uh oh!

mayokek commented Jun 5, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Wild1145 commented Jun 6, 2017

Uh oh!

lemonsked commented Aug 13, 2017

Uh oh!

ghost commented Aug 14, 2017

Uh oh!

Wild1145 commented Aug 15, 2017

Uh oh!

Uh oh!

lemonsked May 31, 2017 •

edited

Loading

lemonsked May 31, 2017 •

edited

Loading

JeromSar May 31, 2017 •

edited

Loading

mayokek commented Jun 5, 2017 •

edited

Loading