Remove redundant initializers and return statements, fix a suspicious…

… lookup
Chipley · Dec 29, 2013 · 9be9867 · 9be9867
1 parent 5a29f2d
commit 9be9867
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 67 deletions.
diff --git a/src/main/java/com/Chipmunk9998/Spectate/Spectate.java b/src/main/java/com/Chipmunk9998/Spectate/Spectate.java
@@ -1,15 +1,14 @@
 package com.Chipmunk9998.Spectate;
 
-import java.io.File;
-import java.io.IOException;
-
+import com.Chipmunk9998.Spectate.api.SpectateManager;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 
-import com.Chipmunk9998.Spectate.api.SpectateManager;
+import java.io.File;
+import java.io.IOException;
 
 public class Spectate extends JavaPlugin {
 
@@ -104,16 +103,10 @@ public static SpectateManager getAPI() {
 	}
 
 	public boolean multiverseInvEnabled() {
-
-		if (getServer().getPluginManager().getPlugin("Multiverse-Inventories") != null && getServer().getPluginManager().getPlugin("Multiverse-Inventories").isEnabled()) {
-
-			return true;
-
-		}
-
-		return false;
-
-	}
+
+        return getServer().getPluginManager().getPlugin("Multiverse-Inventories") != null && getServer().getPluginManager().getPlugin("Multiverse-Inventories").isEnabled();
+
+    }
 
 	public void loadConfig() {
 

diff --git a/src/main/java/com/Chipmunk9998/Spectate/SpectateCommandExecutor.java b/src/main/java/com/Chipmunk9998/Spectate/SpectateCommandExecutor.java
@@ -152,7 +152,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
 
 				}
 
-				SpectateAngle newAngle = SpectateAngle.FIRST_PERSON;
+				SpectateAngle newAngle;
 
 				if (args[1].equalsIgnoreCase("1") || args[1].equalsIgnoreCase("firstperson")) {
 
@@ -243,7 +243,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
 
 				}
 
-				int interval = 0;
+				int interval;
 
 				try {
 
@@ -278,7 +278,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String commandLabel,
 
 			}
 
-			if (cmdsender.getName() == targetPlayer.getName()) {
+			if (cmdsender.getName().equals(targetPlayer.getName())) {
 
 				cmdsender.sendMessage(ChatColor.GRAY + "Did you really just try to spectate yourself?");
 				return true;

diff --git a/src/main/java/com/Chipmunk9998/Spectate/SpectateListener.java b/src/main/java/com/Chipmunk9998/Spectate/SpectateListener.java
@@ -1,7 +1,8 @@
 package com.Chipmunk9998.Spectate;
 
-import java.util.ArrayList;
-
+import com.Chipmunk9998.Spectate.api.ScrollDirection;
+import com.Chipmunk9998.Spectate.api.SpectateMode;
+import com.Chipmunk9998.Spectate.api.SpectateScrollEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Monster;
@@ -12,27 +13,13 @@
 import org.bukkit.event.block.Action;
 import org.bukkit.event.block.BlockBreakEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-import org.bukkit.event.entity.EntityDamageEvent;
-import org.bukkit.event.entity.EntityRegainHealthEvent;
-import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.entity.FoodLevelChangeEvent;
-import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.entity.*;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.bukkit.event.player.PlayerDropItemEvent;
-import org.bukkit.event.player.PlayerGameModeChangeEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerPickupItemEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.*;
 
-import com.Chipmunk9998.Spectate.api.ScrollDirection;
-import com.Chipmunk9998.Spectate.api.SpectateMode;
-import com.Chipmunk9998.Spectate.api.SpectateScrollEvent;
+import java.util.ArrayList;
 
 public class SpectateListener implements Listener {
 
@@ -61,9 +48,8 @@ public void onPlayerQuit(PlayerQuitEvent event) {
 		if (Spectate.getAPI().isSpectating(event.getPlayer())) {
 
 			Spectate.getAPI().stopSpectating(event.getPlayer(), true);
-			return;
 
-		}else if (Spectate.getAPI().isBeingSpectated(event.getPlayer())) {
+        }else if (Spectate.getAPI().isBeingSpectated(event.getPlayer())) {
 
 			for (Player p : Spectate.getAPI().getSpectators(event.getPlayer())) {
 
@@ -95,9 +81,7 @@ public void onPlayerQuit(PlayerQuitEvent event) {
 
 			}
 
-			return;
-
-		}
+        }
 
 	}
 
@@ -136,9 +120,7 @@ public void onPlayerDeath(PlayerDeathEvent event) {
 
 			}
 
-			return;
-
-		}
+        }
 
 	}
 
@@ -173,9 +155,8 @@ public void onPlayerDamage(EntityDamageEvent event) {
 		if (Spectate.getAPI().isSpectating(p)) {
 
 			event.setCancelled(true);
-			return;
 
-		}
+        }
 
 	}
 
@@ -213,9 +194,8 @@ public void onPlayerInteract(PlayerInteractEvent event) {
 			}
 
 			event.setCancelled(true);
-			return;
 
-		}
+        }
 
 	}
 
@@ -240,9 +220,8 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent event) {
 			}
 
 			event.setCancelled(true);
-			return;
 
-		}
+        }
 
 	}
 

diff --git a/src/main/java/com/Chipmunk9998/Spectate/api/SpectateManager.java b/src/main/java/com/Chipmunk9998/Spectate/api/SpectateManager.java
@@ -328,7 +328,7 @@ public boolean scrollRight(Player p, ArrayList<Player> playerList) {
 
 		}
 
-		int scrollToIndex = 1;
+		int scrollToIndex;
 
 		if (getScrollNumber(p, playerList) == playerList.size()) {
 
@@ -379,7 +379,7 @@ public boolean scrollLeft(Player p, ArrayList<Player> playerList) {
 
 		}
 
-		int scrollToIndex = 1;
+		int scrollToIndex;
 
 		if (getScrollNumber(p, playerList) == 1) {
 
@@ -514,15 +514,9 @@ public void stopScanning(Player p) {
 
 	public boolean isScanning(Player p) {
 
-		if (isScanning.contains(p.getName())) {
+        return isScanning.contains(p.getName());
 
-			return true;
-
-		}
-
-		return false;
-
-	}
+    }
 
 	public ArrayList<Player> getSpectateablePlayers() {
 
@@ -536,7 +530,7 @@ public ArrayList<Player> getSpectateablePlayers() {
 
 			}
 
-			if (isSpectating.contains(onlinePlayers.getName())) {
+			if (isSpectating.contains(onlinePlayers)) {
 
 				continue;
 
@@ -624,11 +618,7 @@ private void addSpectator(Player p, Player spectator) {
 
 	private void removeSpectator(Player p, Player spectator) {
 
-		if (spectators.get(p) == null) {
-
-			return;
-
-		}else {
+        if (spectators.get(p) != null) {
 
 			if (spectators.get(p).size() == 1) {
 
@@ -642,7 +632,7 @@ private void removeSpectator(Player p, Player spectator) {
 
 		}
 
-	}
+    }
 
 	public ArrayList<Player> getSpectators(Player p) {