Simplifying a few code writings

BentoBoxWorld · Jan 17, 2020 · a9dafe0 · a9dafe0
1 parent 67bba40
commit a9dafe0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java b/src/main/java/world/bentobox/chat/commands/island/IslandChatCommand.java
@@ -30,11 +30,9 @@ public void setup() {
 
     @Override
     public boolean canExecute(User user, String label, List<String> args) {
-        boolean is = false;
 
-        if(is = this.getIslands().getIslandAt(user.getLocation()).isPresent())
-            island = this.getIslands().getIslandAt(user.getLocation()).get();
-        return is;
+        island = this.getIslands().getIslandAt(user.getLocation()).orElse(null);
+        return island != null;
     }
 
     @Override

diff --git a/src/main/java/world/bentobox/chat/listeners/ChatListener.java b/src/main/java/world/bentobox/chat/listeners/ChatListener.java
@@ -1,9 +1,6 @@
 package world.bentobox.chat.listeners;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 import org.bukkit.Bukkit;
 import org.bukkit.World;
@@ -29,7 +26,7 @@ public class ChatListener implements Listener {
 
     private final Chat addon;
     private final Set<UUID> teamChatUsers;
-    private final HashMap<Island, Set<Player>> islands;
+    private final Map<Island, Set<Player>> islands;
     // List of which users are spying or not on team and island chat
     private final Set<UUID> spies;
     private final Set<UUID> islandSpies;