Update CodeStyle

src/de/steamwar/misslewars/Config.java

@@ -29,7 +29,10 @@ import java.io.File;
 import java.util.logging.Level;
 
 public class Config {
-	private Config(){}
+
+	private Config() {
+
+	}
 
 	public static final int ArenaMinX;
 	public static final int ArenaMaxX;

src/de/steamwar/misslewars/FightScoreboard.java

@@ -32,7 +32,9 @@ import java.util.Objects;
  */
 class FightScoreboard {
 
-    private FightScoreboard(){}
+    private FightScoreboard() {
+
+    }
 
     private static final Scoreboard scoreboard = Objects.requireNonNull(Bukkit.getScoreboardManager()).getMainScoreboard();
     private static final Objective objective;

src/de/steamwar/misslewars/MissileWars.java

@@ -61,7 +61,6 @@ public class MissileWars extends JavaPlugin {
 		new WaitingListener();
 		new FightListener();
 		new ChatListener();
-		new GamemodeListener();
 		getCommand("spectate").setExecutor(new CommandSpectate());
 
 		new WaitingCountdown();

src/de/steamwar/misslewars/countdowns/EndCountdown.java

@@ -52,7 +52,6 @@ public class EndCountdown extends StateDependent {
 
 	@Override
 	public void disable() {
-		if(task != null && !task.isCancelled())
+		if (task != null && !task.isCancelled()) task.cancel();
-			task.cancel();
 	}
 }

src/de/steamwar/misslewars/countdowns/ItemCountdown.java

@@ -87,7 +87,7 @@ public class ItemCountdown extends StateDependent {
 
 	@Override
 	public void disable() {
-		if(task != null && !task.isCancelled())
+		if (task != null && !task.isCancelled()) task.cancel();
-			task.cancel();
 	}
+
 }

src/de/steamwar/misslewars/items/Arrows.java

@@ -36,4 +36,5 @@ public class Arrows extends SpecialItem {
 	public boolean handleUse(Player p) {
 		return false;
 	}
+
 }

src/de/steamwar/misslewars/items/Fireball.java

@@ -44,4 +44,5 @@ public class Fireball extends SpecialItem {
 		fb.setYield(3f);
 		return true;
 	}
+
 }

src/de/steamwar/misslewars/items/LandingPad.java

@@ -76,4 +76,5 @@ public class LandingPad extends SpecialItem {
         editSession.flushSession();
         return true;
     }
+
 }

src/de/steamwar/misslewars/items/Mine.java

@@ -36,4 +36,5 @@ public class Mine extends SpecialItem {
     public boolean handleUse(Player p) {
         return false;
     }
+
 }

src/de/steamwar/misslewars/items/Missile.java

@@ -92,24 +92,24 @@ public class Missile extends SpecialItem {
 	private void lore(List<String> lore, String[] args, int index, String tag) {
 		if (args.length > index) {
 			try {
-				lore.add(graph(Integer.parseInt(args[index]), GRAPH_SIZE) + tag);
+				lore.add(graph(Integer.parseInt(args[index])) + tag);
 				return;
 			} catch (NumberFormatException e) {
 				// Ignored
 			}
 		}
-		lore.add(graph(0, GRAPH_SIZE) + tag);
+		lore.add(graph(0) + tag);
 	}
 
-	private String graph(int index, int size) {
+	private String graph(int index) {
-		if (index > size) index = size;
+		if (index > Missile.GRAPH_SIZE) index = Missile.GRAPH_SIZE;
 		StringBuilder st = new StringBuilder();
 		st.append("§8[§e");
 		if (index > 0) {
 			st.append(repeat(index));
 		}
 		st.append("§7");
-		st.append(repeat(size - index));
+		st.append(repeat(Missile.GRAPH_SIZE - index));
 		st.append("§8]");
 		return st.toString();
 	}

src/de/steamwar/misslewars/items/Shield.java

@@ -36,4 +36,5 @@ public class Shield extends SpecialItem {
 	public boolean handleUse(Player p) {
 		return false;
 	}
+
 }

src/de/steamwar/misslewars/listener/ArenaListener.java

@@ -55,11 +55,7 @@ public class ArenaListener extends BasicListener {
 				p.teleport(Objects.requireNonNull(MissileWars.getTeam(p)).getSpawn());
 			else
 				p.damage(20.0f);
-		}else if(
+		} else if (location.getX() < Config.ArenaMinX || location.getX() > Config.ArenaMaxX || location.getZ() < Config.ArenaMinZ || location.getZ() > Config.ArenaMaxZ) {
-				location.getX() < Config.ArenaMinX ||
-				location.getX() > Config.ArenaMaxX ||
-				location.getZ() < Config.ArenaMinZ ||
-				location.getZ() > Config.ArenaMaxZ){
 			p.teleport(e.getFrom());
 		}
 	}
@@ -81,9 +77,8 @@ public class ArenaListener extends BasicListener {
 
 	@EventHandler(ignoreCancelled = true)
 	public void onInventoryOpen(InventoryOpenEvent event) {
-		if(event.getView().getType() != InventoryType.PLAYER &&
+		if(event.getView().getType() != InventoryType.PLAYER && event.getView().getType() != InventoryType.CRAFTING && event.getView().getType() != InventoryType.CREATIVE) {
-				event.getView().getType() != InventoryType.CRAFTING &&
-				event.getView().getType() != InventoryType.CREATIVE)
 			event.setCancelled(true);
 		}
 	}
+}

src/de/steamwar/misslewars/listener/BasicListener.java

@@ -44,4 +44,5 @@ public abstract class BasicListener extends StateDependent implements Listener {
 	public void disable() {
 		HandlerList.unregisterAll(this);
 	}
+
 }

src/de/steamwar/misslewars/listener/ChatListener.java

@@ -37,4 +37,5 @@ public class ChatListener extends BasicListener {
 		Bukkit.broadcastMessage(e.getPlayer().getDisplayName() + "§8» §7" + e.getMessage());
 		e.setCancelled(true);
 	}
+
 }

src/de/steamwar/misslewars/listener/DeathListener.java

@@ -48,10 +48,10 @@ public class DeathListener extends BasicListener {
 		Player p = e.getPlayer();
 		p.setFireTicks(0);
 		MWTeam team = MissileWars.getTeam(p);
-		if(team == null)
+		if(team == null) return;
-			return;
 
 		e.setRespawnLocation(team.getSpawn());
 		new SpawnPlatformCreator(p);
 	}
+
 }

src/de/steamwar/misslewars/listener/EndListener.java

@@ -37,4 +37,5 @@ public class EndListener extends BasicListener {
 		e.setJoinMessage(null);
 		e.getPlayer().setGameMode(GameMode.SPECTATOR);
 	}
+
 }

src/de/steamwar/misslewars/listener/FightListener.java

@@ -35,13 +35,12 @@ public class FightListener extends BasicListener {
 
 	@EventHandler
 	public void onDamage(EntityDamageByEntityEvent e) {
-		if(!(e.getDamager() instanceof Player && e.getEntity() instanceof Player))
+		if (!(e.getDamager() instanceof Player && e.getEntity() instanceof Player)) return;
-			return;
 
 		Player damager = (Player)e.getDamager();
 		Player reciever = (Player)e.getEntity();
 
-		if(MissileWars.getTeam(damager) == MissileWars.getTeam(reciever))
+		if (MissileWars.getTeam(damager) == MissileWars.getTeam(reciever)) e.setCancelled(true);
-			e.setCancelled(true);
 	}
+
 }

src/de/steamwar/misslewars/listener/ItemListener.java

@@ -84,11 +84,8 @@ public class ItemListener extends BasicListener {
 	@EventHandler
 	public void onItemClick(PlayerInteractEvent e) {
 		ItemStack item = e.getItem();
-		if (item == null)
+		if (item == null) return;
-			return;
+		if (e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.RIGHT_CLICK_AIR) return;
-
-		if(e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.RIGHT_CLICK_AIR)
-			return;
 
 		if (SpecialItem.handleUse(item, e.getPlayer())) {
 			item.setAmount(item.getAmount()-1);

src/de/steamwar/misslewars/listener/PortalDestructListener.java

@@ -39,8 +39,8 @@ public class PortalDestructListener extends BasicListener {
 
 	@EventHandler
 	public void onBlockupdate(BlockPhysicsEvent e) {
-		if (e.getBlock().getType() != Material.NETHER_PORTAL)
+		if (e.getBlock().getType() != Material.NETHER_PORTAL) return;
-			return;
+
 		int z = e.getBlock().getZ();
 		if (z == MissileWars.getRedTeam().getPortalZ())
 			MissileWars.end(WinReasons.PORTAL_DESTROYED, MissileWars.getBlueTeam());
@@ -50,13 +50,12 @@ public class PortalDestructListener extends BasicListener {
 
 	@EventHandler
 	public void onExplosion(EntityExplodeEvent e) {
-		if(e.getEntityType() != EntityType.FIREBALL)
+		if(e.getEntityType() != EntityType.FIREBALL) return;
-			return;
 
 		double z = e.getLocation().getZ();
 		double distRed = Math.abs(Config.RedPortalZ + 0.5 - z);
 		double distBlue = Math.abs(Config.BluePortalZ + 0.5 - z);
-		if(distRed < 2 || distBlue < 2)
+		if(distRed < 2 || distBlue < 2) e.setCancelled(true);
-			e.setCancelled(true);
 	}
+
 }

src/de/steamwar/misslewars/listener/WaitingListener.java

@@ -28,19 +28,18 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import java.util.EnumSet;
 
 public class WaitingListener extends BasicListener {
+
 	public WaitingListener() {
 		super(EnumSet.of(FightState.WAITING));
 	}
 
 	@EventHandler
 	public void onDisconnect(PlayerQuitEvent e) {
-		if(Bukkit.getOnlinePlayers().isEmpty())
+		if(Bukkit.getOnlinePlayers().isEmpty()) Bukkit.shutdown();
-			Bukkit.shutdown();
 	}
 
 	@EventHandler
 	public void onDamage(EntityDamageEvent e) {
-		if(e.getCause() != EntityDamageEvent.DamageCause.VOID)
+		if(e.getCause() != EntityDamageEvent.DamageCause.VOID) e.setCancelled(true);
-			e.setCancelled(true);
 	}
 }