diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java index 0d0498dd..a6101284 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/loadtimer/Loadtimer.java @@ -183,8 +183,7 @@ public class Loadtimer implements Listener { long ignTime = ignite - activate; long explTime = explode - ignTime - activate; - if (explTime < 0) - explTime = loadTime; + if (explTime < 0) explTime = loadTime; int finalAllTnt = allTnt; long finalExplTime = explTime; diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java index 354358fc..38409347 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java @@ -150,8 +150,9 @@ public class TraceManager implements Listener { .map(Map.Entry::getKey) .findFirst() .orElse(null); - if (traceId == null) + if (traceId == null) { throw new RuntimeException("Trace not found while trying to remove see (c978eb98-b0b2-4009-91d8-acfa34e2831a)"); + } traces.remove(traceId); trace.hide(); trace.getRecordsSaveFile().delete(); diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java index 70064796..5c061545 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/world/AFKStopperListener.java @@ -57,8 +57,9 @@ public class AFKStopperListener implements Listener { if (to == null) return; Location from = event.getFrom(); - if (from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw()) + if (from.getPitch() != to.getPitch() || from.getYaw() != to.getYaw()) { lastMovementTime = System.currentTimeMillis(); + } } @EventHandler(priority = EventPriority.LOWEST) diff --git a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java index de505b77..e2106380 100644 --- a/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java +++ b/CommonCore/SQL/src/de/steamwar/sql/GameModeConfig.java @@ -995,8 +995,7 @@ public final class GameModeConfig { public String convertToRealMapName(String map) { for (String m : Server.Maps) { - if (m.equalsIgnoreCase(map)) - return m; + if (m.equalsIgnoreCase(map)) return m; } return null; } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java index 4c0e14f2..5faba1ef 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/ai/AI.java @@ -133,18 +133,19 @@ public abstract class AI { public Vector getPosition() { Location location = entity.getLocation(); Region extend = team.getExtendRegion(); - if (Fight.getUnrotated() == team) + if (Fight.getUnrotated() == team) { return new Vector( location.getX() - extend.getMinX(), location.getY() - team.getSchemRegion().getMinY(), location.getZ() - extend.getMinZ() ); - else + } else { return new Vector( extend.getMaxX() - location.getX(), location.getY() - team.getSchemRegion().getMinY(), extend.getMaxZ() - location.getZ() ); + } } public Material getBlock(Vector pos) { @@ -170,8 +171,7 @@ public abstract class AI { } Block block = location.getBlock(); - if (block.getType() == Material.AIR) - block.setType(Material.TNT); + if (block.getType() == Material.AIR) block.setType(Material.TNT); } }); } @@ -308,8 +308,7 @@ public abstract class AI { } } - if (!queue.isEmpty() && --queue.peek().delay == 0) - queue.poll().run(); + if (!queue.isEmpty() && --queue.peek().delay == 0) queue.poll().run(); } public Location translate(Vector pos) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java index a05aeba1..b90b92ee 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/Commands.java @@ -102,8 +102,7 @@ public class Commands { } static void leaveTeam(Player p) { - if (checkSetup(p)) - return; + if (checkSetup(p)) return; FightTeam fightTeam = checkGetTeam(p); if (fightTeam == null) return; @@ -112,8 +111,7 @@ public class Commands { } static void kick(Player p, String kicked) { - if (checkSetup(p)) - return; + if (checkSetup(p)) return; FightTeam fightTeam = checkGetTeam(p); if (fightTeam == null) return; diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java index b977c026..a65886b0 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/GUI.java @@ -128,8 +128,7 @@ public class GUI { public static void managePlayers(Player p) { List> players = SWListInv.createPlayerList(p.getUniqueId()); FightTeam team = Fight.getPlayerTeam(p); - if (team == null) - return; + if (team == null) return; players.removeIf(listEntry -> !team.equals(Fight.getPlayerTeam(Bukkit.getPlayer(listEntry.getObject())))); players.forEach(listEntry -> listEntry.getItem().setLore(msg.parse("MANAGE_LORE1", p), msg.parse("MANAGE_LORE2", p))); SWListInv inv = new SWListInv<>(p, msg.parse("MANAGE_TITLE", p), players, (ClickType click, UUID player) -> { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java index f9c944bd..4fc8e96c 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/commands/InfoCommand.java @@ -49,8 +49,9 @@ public class InfoCommand implements CommandExecutor { if (!SteamwarUser.get(player.getUniqueId()).hasPerm(UserPerm.CHECK)) return false; for (FightTeam team : Fight.teams()) { - if (!team.isLeaderless()) + if (!team.isLeaderless()) { FightSystem.getMessage().send("INFO_LEADER", player, team.getColoredName(), team.getLeader().getEntity().getName()); + } if (team.getSchematic() != 0) { SchematicNode schematic = SchematicNode.getSchematicNode(team.getSchematic()); diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java index f1b77c72..790a1cec 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/fight/FightSchematic.java @@ -136,10 +136,11 @@ public class FightSchematic extends StateDependent { changeRotation = new Random().nextBoolean(); usedRotate = rotate ^ changeRotation; } - if (team.isBlue()) + if (team.isBlue()) { GlobalRecorder.getInstance().blueSchem(schematic, changeRotation); - else + } else { GlobalRecorder.getInstance().redSchem(schematic, changeRotation); + } } Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::paste); diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java index b5f2df18..0a506cbf 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Recording.java @@ -71,8 +71,7 @@ public class Recording implements Listener { private static final Random random = new Random(); public static ItemStack disarmNull(ItemStack stack) { - if (stack == null) - return new ItemStack(Material.AIR); + if (stack == null) return new ItemStack(Material.AIR); return stack; } @@ -121,8 +120,7 @@ public class Recording implements Listener { new StateDependentTask(ArenaMode.AntiReplay, FightState.All, () -> { GlobalRecorder.getInstance().tick(); - if (FightState.getFightState() == FightState.SPECTATE || !GlobalRecorder.getInstance().recording()) - return; + if (FightState.getFightState() == FightState.SPECTATE || !GlobalRecorder.getInstance().recording()) return; iterateOverEntities(primedTnt::isInstance, this::trackEntity); }, 1, 1); @@ -139,8 +137,9 @@ public class Recording implements Listener { private static final Object releaseUseItem = playerDigType.getEnumConstants()[5]; private Object blockDig(Player p, Object packet) { - if (!isNotSent(p) && blockDigType.get(packet) == releaseUseItem) + if (!isNotSent(p) && blockDigType.get(packet) == releaseUseItem) { GlobalRecorder.getInstance().bowSpan(p, false, false); + } return packet; } @@ -148,8 +147,9 @@ public class Recording implements Listener { private Object blockPlace(Player p, Object packet) { boolean mainHand = BountifulWrapper.impl.mainHand(packet); - if (!isNotSent(p) && BountifulWrapper.impl.bowInHand(mainHand, p)) + if (!isNotSent(p) && BountifulWrapper.impl.bowInHand(mainHand, p)) { GlobalRecorder.getInstance().bowSpan(p, true, !mainHand); + } return packet; } @@ -160,8 +160,7 @@ public class Recording implements Listener { @EventHandler(priority = EventPriority.HIGH) public void onPlayerMove(PlayerMoveEvent e) { - if (isNotSent(e.getPlayer())) - return; + if (isNotSent(e.getPlayer())) return; GlobalRecorder.getInstance().entityMoves(e.getPlayer()); } @@ -178,66 +177,61 @@ public class Recording implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onBlockPhysics(BlockPhysicsEvent e) { - if (FlatteningWrapper.impl.doRecord(e)) + if (FlatteningWrapper.impl.doRecord(e)) { GlobalRecorder.getInstance().blockChange(e.getBlock()); + } } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onSneak(PlayerToggleSneakEvent e) { - if (isNotSent(e.getPlayer())) - return; + if (isNotSent(e.getPlayer())) return; GlobalRecorder.getInstance().playerSneak(e.getPlayer(), e.isSneaking()); } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onAnimation(PlayerAnimationEvent e) { - if (isNotSent(e.getPlayer())) - return; + if (isNotSent(e.getPlayer())) return; - if (e.getAnimationType() == PlayerAnimationType.ARM_SWING) + if (e.getAnimationType() == PlayerAnimationType.ARM_SWING) { GlobalRecorder.getInstance().entityAnimation(e.getPlayer(), AIR); + } } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onEntityDamage(EntityDamageEvent e) { - if (!e.getEntityType().isAlive()) - return; + if (!e.getEntityType().isAlive()) return; LivingEntity p = (LivingEntity) e.getEntity(); - if (isNotSent(p)) - return; + if (isNotSent(p)) return; GlobalRecorder.getInstance().damageAnimation(p); - if (e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE) + if (e.getCause() == EntityDamageEvent.DamageCause.FIRE_TICK || e.getCause() == EntityDamageEvent.DamageCause.FIRE) { GlobalRecorder.getInstance().setOnFire(p, false); + } } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onEntityCombust(EntityCombustEvent e) { - if (!e.getEntityType().isAlive()) - return; + if (!e.getEntityType().isAlive()) return; LivingEntity p = (LivingEntity) e.getEntity(); - if (isNotSent(p)) - return; + if (isNotSent(p)) return; GlobalRecorder.getInstance().setOnFire(p, false); } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onTNTSpawn(EntitySpawnEvent e) { - if (e.getEntityType() != EntityType.TNT) - return; + if (e.getEntityType() != EntityType.TNT) return; GlobalRecorder.getInstance().tntSpawn(e.getEntity()); } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onExplosion(EntityExplodeEvent e) { - if (e.getEntityType() != EntityType.TNT) - return; + if (e.getEntityType() != EntityType.TNT) return; Location loc = e.getLocation(); GlobalRecorder.getInstance().entityDespawns(e.getEntity()); @@ -247,28 +241,26 @@ public class Recording implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onItem(PlayerItemHeldEvent e) { - if (isNotSent(e.getPlayer())) - return; + if (isNotSent(e.getPlayer())) return; GlobalRecorder.getInstance().item(e.getPlayer(), disarmNull(e.getPlayer().getInventory().getItem(e.getNewSlot())), "MAINHAND"); } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onProjectileSpawn(ProjectileLaunchEvent e) { - if (e.getEntityType() == EntityType.FIREBALL) + if (e.getEntityType() == EntityType.FIREBALL) { GlobalRecorder.getInstance().fireballSpawn(e.getEntity()); - else if (e.getEntityType() == EntityType.ARROW) + } else if (e.getEntityType() == EntityType.ARROW) { GlobalRecorder.getInstance().arrowSpawn(e.getEntity()); + } } @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onInventoryClick(InventoryClickEvent e) { Player player = (Player) e.getWhoClicked(); - if (isNotSent(player)) - return; + if (isNotSent(player)) return; - if (e.getSlotType() != InventoryType.SlotType.ARMOR) - return; + if (e.getSlotType() != InventoryType.SlotType.ARMOR) return; switch (e.getSlot()) { case 103: @@ -287,12 +279,10 @@ public class Recording implements Listener { } private void setKitItems(FightTeam team) { - if (FightState.getFightState() != FightState.PRE_RUNNING) - return; + if (FightState.getFightState() != FightState.PRE_RUNNING) return; for (FightPlayer fp : team.getPlayers()) { - if (!fp.isLiving()) - continue; + if (!fp.isLiving()) continue; fp.ifPlayer(player -> { BountifulWrapper.impl.recordHandItems(player); @@ -306,8 +296,9 @@ public class Recording implements Listener { private void despawnTeam(FightTeam team) { for (FightPlayer player : team.getPlayers()) { - if (player.isLiving()) + if (player.isLiving()) { GlobalRecorder.getInstance().entityDespawns(player.getEntity()); + } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java index 2e836bbc..2d502d2a 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/SetupQuit.java @@ -41,8 +41,7 @@ public class SetupQuit implements Listener { public void handlePlayerQuit(PlayerQuitEvent event) { Player player = event.getPlayer(); FightTeam team = Fight.getPlayerTeam(player); - if (team == null) - return; + if (team == null) return; team.removePlayer(player); } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java index aaa4a8a0..a4acd27f 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Shutdown.java @@ -38,11 +38,11 @@ public class Shutdown implements Listener { @EventHandler public void handlePlayerQuit(PlayerQuitEvent event) { - if (Config.replayserver() || Config.GameModeConfig.Arena.Leaveable) - return; + if (Config.replayserver() || Config.GameModeConfig.Arena.Leaveable) return; //Shutdown server if nobody online - if (Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().size() == 1 && Bukkit.getOnlinePlayers().contains(event.getPlayer()))) + if (Bukkit.getOnlinePlayers().isEmpty() || (Bukkit.getOnlinePlayers().size() == 1 && Bukkit.getOnlinePlayers().contains(event.getPlayer()))) { Bukkit.shutdown(); + } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java index e118a9e3..d070ce98 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/Spectator.java @@ -57,8 +57,9 @@ public class Spectator implements Listener { public void handlePlayerJoin(PlayerJoinEvent e) { Player player = e.getPlayer(); - if (player.getGameMode() == GameMode.SPECTATOR) + if (player.getGameMode() == GameMode.SPECTATOR) { gameModeChange(player, GameMode.SPECTATOR); + } } @EventHandler @@ -70,13 +71,15 @@ public class Spectator implements Listener { private void gameModeChange(Player player, GameMode gameMode) { if (gameMode == GameMode.SPECTATOR) { for (Player p : Bukkit.getServer().getOnlinePlayers()) { - if (p.getUniqueId() != player.getUniqueId()) + if (p.getUniqueId() != player.getUniqueId()) { p.hidePlayer(player); + } } } else { for (Player p : Bukkit.getServer().getOnlinePlayers()) { - if (p.getUniqueId() != player.getUniqueId()) + if (p.getUniqueId() != player.getUniqueId()) { p.showPlayer(player); + } } } } @@ -93,16 +96,17 @@ public class Spectator implements Listener { continue; } - if (Config.isReferee(player)) - continue; + if (Config.isReferee(player)) continue; FightPlayer fightPlayer = Fight.getFightPlayer(player); if (fightPlayer == null || !fightPlayer.getTeam().getExtendRegion().playerInRegion(player.getLocation())) { - if (pseudoSpectator.add(player)) + if (pseudoSpectator.add(player)) { pseudoSpectator(player, true); + } } else { - if (pseudoSpectator.remove(player)) + if (pseudoSpectator.remove(player)) { pseudoSpectator(player, false); + } } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java index f29bb9e3..0c8ce1a2 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/TeamArea.java @@ -55,8 +55,9 @@ public class TeamArea implements Listener { @EventHandler public void playerJoin(PlayerJoinEvent e) { Player player = e.getPlayer(); - if (Fight.getPlayerTeam(player) != team && !Config.isReferee(player)) + if (Fight.getPlayerTeam(player) != team && !Config.isReferee(player)) { spectatorBorder.addPlayer(player); + } } @EventHandler @@ -74,8 +75,9 @@ public class TeamArea implements Listener { public void teamLeave(TeamLeaveEvent e) { FightPlayer fightPlayer = e.getFightPlayer(); fightPlayer.ifPlayer(spectatorBorder::addPlayer); - if (fightPlayer.getTeam() == team) + if (fightPlayer.getTeam() == team) { fightPlayer.ifPlayer(bordingBorder::removePlayer); + } } @EventHandler diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java index cd4665ee..6ac8183a 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/listener/WaterRemover.java @@ -58,13 +58,13 @@ public class WaterRemover implements Listener { @EventHandler public void handleEntitySpawn(EntitySpawnEvent event) { - if (event.getEntityType() != EntityType.TNT) - return; + if (event.getEntityType() != EntityType.TNT) return; Location location = event.getLocation(); Fight.teams().forEach(team -> { - if (team.getExtendRegion().inRegion(location)) + if (team.getExtendRegion().inRegion(location)) { tnt.put(event.getEntity().getEntityId(), team); + } }); } @@ -98,15 +98,12 @@ public class WaterRemover implements Listener { private void checkBlock(Block b) { //do not remove outside teamareas - if (!Config.BlueExtendRegion.inRegion(b) && !Config.RedExtendRegion.inRegion(b)) - return; + if (!Config.BlueExtendRegion.inRegion(b) && !Config.RedExtendRegion.inRegion(b)) return; //checks for water and removes it, if present - if (!FlatteningWrapper.impl.removeWater(b)) - return; + if (!FlatteningWrapper.impl.removeWater(b)) return; - if (b.getY() < MIN_Y) - return; + if (b.getY() < MIN_Y) return; checkNeighbours(b); } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java index 726fdc27..947e971f 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java @@ -190,10 +190,11 @@ public class PacketProcessor implements Listener { execSync(() -> { FightTeam winner = null; - if (team == 0x01) + if (team == 0x01) { winner = Fight.getBlueTeam(); - else if (team == 0x02) + } else if (team == 0x02) { winner = Fight.getRedTeam(); + } FightSystem.setSpectateState(winner, "Replay ends", message.getMsg(), message.getParams()); }); @@ -248,8 +249,9 @@ public class PacketProcessor implements Listener { addREntity(entityId, new RPlayer(entityServer, user.getUUID(), user.getUserName(), Config.SpecSpawn)); team.addEntry(user.getUserName()); - if (ArenaMode.Test.contains(Config.mode)) + if (ArenaMode.Test.contains(Config.mode)) { entities.get(entityId).setGlowing(true); + } }); } @@ -318,8 +320,9 @@ public class PacketProcessor implements Listener { execSync(() -> { REntity entity = entities.get(entityId); - if (entity != null) + if (entity != null) { entity.setVelocity(dX, dY, dZ); + } }); } @@ -330,8 +333,9 @@ public class PacketProcessor implements Listener { String slotName = source.readUTF(); ItemStack stack = new ItemStack(Material.valueOf(item.replace("minecraft:", "").toUpperCase()), 1); - if (enchanted) + if (enchanted) { stack.addUnsafeEnchantment(Enchantment.UNBREAKING, 1); + } EquipmentSlot slot; switch (slotName) { @@ -452,8 +456,7 @@ public class PacketProcessor implements Listener { } private void setBlock(int x, int y, int z, int blockState) { - if (!Config.ArenaRegion.in2dRegion(x, z)) - return; //Outside of the arena + if (!Config.ArenaRegion.in2dRegion(x, z)) return; //Outside of the arena execSync(() -> { BlockIdWrapper.impl.setBlock(Config.world, x, y, z, TechHiderWrapper.ENABLED && hiddenBlockIds.contains(blockState) ? obfuscateWith : blockState); @@ -514,8 +517,7 @@ public class PacketProcessor implements Listener { private void pasteSchem(FightTeam team) throws IOException { int schemId = source.readInt(); - if (schemId == 0) - return; + if (schemId == 0) return; execSync(() -> team.pasteSchem(SchematicNode.getSchematicNode(schemId))); } @@ -652,8 +654,9 @@ public class PacketProcessor implements Listener { private void tick() { execSync(entityServer::tick); - if (!source.async() && !skipToSubtitle) + if (!source.async() && !skipToSubtitle) { tickFinished = true; + } } private void process() { @@ -663,8 +666,7 @@ public class PacketProcessor implements Listener { int packetType = Byte.toUnsignedInt(source.readByte()); lastPackets.add(packetType); - if (lastPackets.size() > 10) - lastPackets.remove(0); + if (lastPackets.size() > 10) lastPackets.remove(0); PacketParser parser = packetDecoder[packetType]; if (parser != null) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java index 8803a4bd..dec7160c 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/record/Recorder.java @@ -60,10 +60,11 @@ public interface Recorder { default void enableTeam(FightTeam team) { if (FightState.Schem.contains(FightState.getFightState())) { - if (team.isBlue()) + if (team.isBlue()) { blueSchem(team.getSchematic(), false); - else + } else { redSchem(team.getSchematic(), false); + } } if (FightState.AntiSpectate.contains(FightState.getFightState())) { @@ -192,8 +193,7 @@ public interface Recorder { write(0x08, e.getEntityId()); entityMoves(e); entitySpeed(e); - if (e.getFireTicks() > 0) - setOnFire(e, true); + if (e.getFireTicks() > 0) setOnFire(e, true); } default void fireballSpawn(Entity e) { @@ -339,51 +339,53 @@ public interface Recorder { } default void writeObject(DataOutputStream stream, Object o) throws IOException { - if (o instanceof Boolean) + if (o instanceof Boolean) { stream.writeBoolean((Boolean) o); - else if (o instanceof Byte) + } else if (o instanceof Byte) { stream.writeByte((Byte) o); - else if (o instanceof Short) + } else if (o instanceof Short) { stream.writeShort((Short) o); - else if (o instanceof Integer) + } else if (o instanceof Integer) { stream.writeInt((Integer) o); - else if (o instanceof Long) + } else if (o instanceof Long) { stream.writeLong((Long) o); - else if (o instanceof Float) + } else if (o instanceof Float) { stream.writeFloat((Float) o); - else if (o instanceof Double) + } else if (o instanceof Double) { stream.writeDouble((Double) o); - else if (o instanceof String) + } else if (o instanceof String) { stream.writeUTF((String) o); - else if (o instanceof byte[]) + } else if (o instanceof byte[]) { stream.write((byte[]) o); - else if (o instanceof Message) + } else if (o instanceof Message) { writeMessage(stream, (Message) o); - else + } else { throw new SecurityException("Undefined write for: " + o.getClass().getName()); + } } default void writeMessage(DataOutputStream stream, Message message) throws IOException { stream.writeUTF(message.getMsg()); for (Object o : message.getParams()) { - if (o instanceof Boolean) + if (o instanceof Boolean) { stream.writeByte(0x01); - else if (o instanceof Byte) + } else if (o instanceof Byte) { stream.writeByte(0x02); - else if (o instanceof Short) + } else if (o instanceof Short) { stream.writeByte(0x03); - else if (o instanceof Integer) + } else if (o instanceof Integer) { stream.writeByte(0x04); - else if (o instanceof Float) + } else if (o instanceof Float) { stream.writeByte(0x05); - else if (o instanceof Double) + } else if (o instanceof Double) { stream.writeByte(0x06); - else if (o instanceof String) + } else if (o instanceof String) { stream.writeByte(0x07); - else if (o instanceof Message) + } else if (o instanceof Message) { stream.writeByte(0x08); - else + } else { throw new SecurityException("Undefined message serialization for: " + o.getClass().getName()); + } writeObject(stream, o); } stream.writeByte(0x00); diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java index c595e688..c2fe5790 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/FightState.java @@ -55,12 +55,10 @@ public enum FightState { private static FightState fightState = PRE_LEADER_SETUP; public static void registerStateDependent(IStateDependent stateDependent) { - if (stateDependent.enabled().isEmpty()) - return; + if (stateDependent.enabled().isEmpty()) return; boolean enabled = stateDependent.enabled().contains(fightState); stateDependentFeatures.put(stateDependent, enabled); - if (enabled) - stateDependent.enable(); + if (enabled) stateDependent.enable(); } public static void setFightState(FightState state) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java index 26f35ad5..9382a490 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependent.java @@ -44,8 +44,7 @@ public abstract class StateDependent implements IStateDependent { } public void register() { - if (register) - FightState.registerStateDependent(this); + if (register) FightState.registerStateDependent(this); } @Override diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java index 80f5256b..f9f5c744 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/states/StateDependentCountdown.java @@ -65,7 +65,6 @@ public class StateDependentCountdown extends StateDependent { @Override public void disable() { countdown.disable(); - if (mainCountdown == countdown) - mainCountdown = null; + if (mainCountdown == countdown) mainCountdown = null; } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java index f973c1ba..e6945ba5 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BlockIdWrapper.java @@ -58,8 +58,9 @@ public class BlockIdWrapper { } public void trackEntity(Player player, Entity entity) { - if (entity instanceof Player) + if (entity instanceof Player) { TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.REMOVE, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE)); + } player.showEntity(FightSystem.getPlugin(), entity); } @@ -67,7 +68,8 @@ public class BlockIdWrapper { public void untrackEntity(Player player, Entity entity) { player.hideEntity(FightSystem.getPlugin(), entity); - if (entity instanceof Player) + if (entity instanceof Player) { TinyProtocol.instance.sendPacket(player, ProtocolWrapper.playerInfoPacketConstructor(ProtocolWrapper.PlayerInfoAction.ADD, new GameProfile(entity.getUniqueId(), entity.getName()), GameMode.CREATIVE)); + } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java index 89150878..e1cefc9c 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/BountifulWrapper.java @@ -70,8 +70,7 @@ public class BountifulWrapper { return new Listener() { @EventHandler public void onArrowPickup(PlayerPickupArrowEvent e) { - if (Fight.fighting(e.getPlayer())) - e.setCancelled(true); + if (Fight.fighting(e.getPlayer())) e.setCancelled(true); } }; } @@ -80,8 +79,7 @@ public class BountifulWrapper { return new Listener() { @EventHandler public void onSwapItems(PlayerSwapHandItemsEvent event) { - if (Fight.fighting(event.getPlayer())) - event.setCancelled(true); + if (Fight.fighting(event.getPlayer())) event.setCancelled(true); } }; } @@ -122,14 +120,11 @@ public class BountifulWrapper { BossBar bar = barMap.get(player); BarColor color = chat2bar(team.getColor()); - if (bar.getColor() != color) - bar.setColor(color); + if (bar.getColor() != color) bar.setColor(color); - if (bar.getProgress() != progress) - bar.setProgress(progress); + if (bar.getProgress() != progress) bar.setProgress(progress); - if (!bar.getTitle().equals(text)) - bar.setTitle(text); + if (!bar.getTitle().equals(text)) bar.setTitle(text); } private BarColor chat2bar(ChatColor color) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java index bd30fb36..5a26998e 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java @@ -136,10 +136,11 @@ public class FightStatistics { } private int getLeader(FightTeam team) { - if (team.getLeader() != null) + if (team.getLeader() != null) { return team.getLeader().getUser().getId(); - else if (team.getDesignatedLeader() != null) + } else if (team.getDesignatedLeader() != null) { return SteamwarUser.get(team.getDesignatedLeader()).getId(); + } return 0; } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java index bca4e721..ce6fa5d4 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FightUI.java @@ -110,10 +110,11 @@ public class FightUI { case SPECTATE: default: generator = (l, r, lP, rP, lW, rW) -> { - if (FightSystem.getLastWinner() == null) + if (FightSystem.getLastWinner() == null) { return new Message("BAR_TIE", time, l.getColoredName(), r.getColoredName()); - else + } else { return new Message("BAR_WIN", time, l.getColoredName(), r.getColoredName(), FightSystem.getLastWinner().getColoredName()); + } }; break; } @@ -159,8 +160,7 @@ public class FightUI { private void tpsWatcher() { double tps = TPSWatcher.getTPS(); - if (tps < 15.0) - FightSystem.getMessage().broadcastActionbar("TPS_WARNING", tps); + if (tps < 15.0) FightSystem.getMessage().broadcastActionbar("TPS_WARNING", tps); } public enum BossBarType { @@ -183,13 +183,13 @@ public class FightUI { } private static BossBarType byAngle(double angle) { - if (BLUE_NEG_Z) - angle += 180; + if (BLUE_NEG_Z) angle += 180; angle = ((angle % 360) + 360) % 360; for (BossBarType type : values()) { - if (type.minAngle < type.maxAngle ? type.minAngle <= angle && angle < type.maxAngle : type.minAngle <= angle || angle < type.maxAngle) + if (type.minAngle < type.maxAngle ? type.minAngle <= angle && angle < type.maxAngle : type.minAngle <= angle || angle < type.maxAngle) { return type; + } } throw new SecurityException("No boss bar for angle " + angle + " found"); @@ -207,23 +207,22 @@ public class FightUI { GlobalRecorder.getInstance().winMessage(winner, subtitle, params); Bukkit.getOnlinePlayers().forEach(Player::resetTitle); - if (winner != null) + if (winner != null) { Bukkit.getOnlinePlayers().forEach(p -> WorldOfColorWrapper.impl.sendTitle(p, FightSystem.getMessage().parse("UI_WIN", p, winner.getColor(), winner.getName()), FightSystem.getMessage().parse(subtitle, p, params), 5, 40, 5)); - else + } else { Bukkit.getOnlinePlayers().forEach(p -> WorldOfColorWrapper.impl.sendTitle(p, FightSystem.getMessage().parse("UI_DRAW", p), FightSystem.getMessage().parse(subtitle, p, params), 5, 40, 5)); + } } public static void addSubtitle(String msg, Object... params) { - if (FightState.Spectate.contains(FightState.getFightState())) - return; + if (FightState.Spectate.contains(FightState.getFightState())) return; Message message = new Message(msg, params); queue.add(message); GlobalRecorder.getInstance().subtitle(message); FightSystem.getPlugin().getLogger().log(Level.INFO, FightSystem.getMessage().parse(msg, null, params)); - if (!subtitleScheduled) - printSubtitle(); + if (!subtitleScheduled) printSubtitle(); } private static void printSubtitle() { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java index 1b75e3e0..099ed3ef 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java @@ -36,12 +36,10 @@ public class FlatteningWrapper { public static final FlatteningWrapper impl = new FlatteningWrapper(); public boolean isWater(Block block) { - if (block.getType() == Material.WATER) - return true; + if (block.getType() == Material.WATER) return true; BlockData data = block.getBlockData(); - if (!(data instanceof Waterlogged)) - return false; + if (!(data instanceof Waterlogged)) return false; return ((Waterlogged) data).isWaterlogged(); } @@ -54,8 +52,7 @@ public class FlatteningWrapper { } BlockData data = block.getBlockData(); - if (!(data instanceof Waterlogged)) - return false; + if (!(data instanceof Waterlogged)) return false; Waterlogged waterlogged = (Waterlogged) data; if (waterlogged.isWaterlogged()) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java index ce2afc22..695f794f 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/Hull.java @@ -124,11 +124,9 @@ public class Hull { public void checkREntity(REntity entity) { Location location = new Location(Config.world, entity.getX(), entity.getY(), entity.getZ()); if (region.inRegion(location) && !visibility.get(new IntVector(location).toId(region))) { - if (rentities.add(entity)) - entity.hide(true); + if (rentities.add(entity)) entity.hide(true); } else { - if (rentities.remove(entity)) - entity.hide(false); + if (rentities.remove(entity)) entity.hide(false); } } @@ -146,8 +144,9 @@ public class Hull { long start = System.currentTimeMillis(); region.forEach((x, y, z) -> { IntVector block = new IntVector(x, y, z); - if (isOccluding(Config.world.getBlockAt(x, y, z).getType())) + if (isOccluding(Config.world.getBlockAt(x, y, z).getType())) { occluding.set(block.toId(region)); + } }); forEachBorder((root, direction) -> uncoverBlocks(new NullList<>(), root, direction)); FightSystem.getPlugin().getLogger().log(Level.INFO, () -> "[HullHider] initialisation finished: " + (System.currentTimeMillis() - start) + " ms, visible blocks: " + visibility.cardinality()); @@ -155,16 +154,13 @@ public class Hull { public void updateBlockVisibility(Block b, Material changedType) { IntVector root = new IntVector(b.getX(), b.getY(), b.getZ()); - if (root.notInRegion(region)) - return; + if (root.notInRegion(region)) return; int id = root.toId(region); - if (!occluding.get(id) || isOccluding(changedType)) - return; + if (!occluding.get(id) || isOccluding(changedType)) return; occluding.clear(id); - if (!visibility.get(id)) - return; + if (!visibility.get(id)) return; List uncovered = new ArrayList<>(); for (Map.Entry directionalVisibility : visibilityDirections.entrySet()) { @@ -195,8 +191,9 @@ public class Hull { private void forEachBorder(BiConsumer f) { for (int x = region.getMinX(); x < region.getMaxX(); x++) { for (int z = region.getMinZ(); z < region.getMaxZ(); z++) { - if (groundVisible) + if (groundVisible) { f.accept(new IntVector(x, region.getMinY(), z), new IntVector(0, 1, 0)); + } f.accept(new IntVector(x, region.getMaxY() - 1, z), new IntVector(0, -1, 0)); } } @@ -228,12 +225,10 @@ public class Hull { } private void uncoverBlocks(List uncovered, IntVector block, IntVector direction, BitSet directionalVisibility, IntVector[] branchDirections) { - if (block.notInRegion(region)) - return; + if (block.notInRegion(region)) return; int id = block.toId(region); - if (directionalVisibility.get(id)) - return; + if (directionalVisibility.get(id)) return; directionalVisibility.set(id); if (!visibility.get(id)) { @@ -241,8 +236,7 @@ public class Hull { uncovered.add(block); } - if (occluding.get(id)) - return; + if (occluding.get(id)) return; uncoverBlocks(uncovered, block.add(direction), direction, directionalVisibility, branchDirections); for (IntVector branchDirection : branchDirections) @@ -290,8 +284,9 @@ public class Hull { @Override public boolean equals(Object o) { - if (o == null || this.getClass() != o.getClass()) + if (o == null || this.getClass() != o.getClass()) { return false; + } IntVector v = (IntVector) o; return x == v.x && y == v.y && z == v.z; diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java index 9989548e..e25e7300 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/HullHider.java @@ -99,8 +99,7 @@ public class HullHider implements Listener { } public void initialize(FightTeam team) { - if (!TechHiderWrapper.ENABLED) - return; + if (!TechHiderWrapper.ENABLED) return; hullMap.get(team).initialize(); } @@ -117,8 +116,7 @@ public class HullHider implements Listener { } public void updatePlayer(Player player) { - if (!TechHiderWrapper.ENABLED) - return; + if (!TechHiderWrapper.ENABLED) return; FightTeam team = Fight.getPlayerTeam(player); FightPlayer fp = Fight.getFightPlayer(player); @@ -139,33 +137,37 @@ public class HullHider implements Listener { @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlockPhysic(BlockPhysicsEvent e) { - if (FlatteningWrapper.impl.doRecord(e)) + if (FlatteningWrapper.impl.doRecord(e)) { blockUpdate(e.getBlock(), e.getChangedType()); + } } public void blockUpdate(Block block, Material changedType) { - for (Hull hull : hulls) + for (Hull hull : hulls) { hull.updateBlockVisibility(block, changedType); + } } public boolean isBlockHidden(Player player, int x, int y, int z) { - if (!TechHiderWrapper.ENABLED) - return false; + if (!TechHiderWrapper.ENABLED) return false; - for (Hull hull : hulls) - if (hull.isBlockHidden(player, x, y, z)) + for (Hull hull : hulls) { + if (hull.isBlockHidden(player, x, y, z)) { return true; + } + } return false; } public boolean blockPrecise(Player player, int chunkX, int chunkY, int chunkZ) { - if (!TechHiderWrapper.ENABLED) - return false; + if (!TechHiderWrapper.ENABLED) return false; - for (Hull hull : hulls) - if (hull.blockPrecise(player, chunkX, chunkY, chunkZ)) + for (Hull hull : hulls) { + if (hull.blockPrecise(player, chunkX, chunkY, chunkZ)) { return true; + } + } return false; } @@ -231,8 +233,7 @@ public class HullHider implements Listener { private Object packetHider(Player player, Object packet, Location location) { for (Hull hull : hulls) { - if (hull.isLocationHidden(player, location)) - return null; + if (hull.isLocationHidden(player, location)) return null; } return packet; diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java index c4d66eb1..b3fae41f 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/TechHiderWrapper.java @@ -96,8 +96,9 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati @EventHandler public void teamLeave(TeamLeaveEvent e) { e.getFightPlayer().ifPlayer(player -> { - if (player.isOnline()) + if (player.isOnline()) { hiddenRegion.put(player, getHiddenRegion(player)); + } }); } @@ -108,8 +109,7 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati } public void reloadChunks(Player player, Region region, Region exclusion) { - if (!ENABLED || !FightState.Schem.contains(FightState.getFightState()) || !player.isOnline()) - return; + if (!ENABLED || !FightState.Schem.contains(FightState.getFightState()) || !player.isOnline()) return; region.forEachChunk((chunkX, chunkZ) -> { if (exclusion.chunkOutside(chunkX, chunkZ)) { @@ -185,15 +185,12 @@ public class TechHiderWrapper extends StateDependent implements TechHider.Locati } private Region getHiddenRegion(Player player) { - if (Config.isReferee(player)) - return Region.EMPTY; + if (Config.isReferee(player)) return Region.EMPTY; FightTeam team = Fight.getPlayerTeam(player); - if (team == null) - return Config.ArenaRegion; + if (team == null) return Config.ArenaRegion; - if (team.canPlayerEntern(player)) - return Region.EMPTY; + if (team.canPlayerEntern(player)) return Region.EMPTY; return Fight.getOpposite(team).getExtendRegion(); } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java index 6e8c2a27..7075bce1 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldOfColorWrapper.java @@ -36,8 +36,7 @@ public class WorldOfColorWrapper { } public boolean isInBlock(Projectile e) { - if (e instanceof Arrow) - return ((Arrow) e).isInBlock(); + if (e instanceof Arrow arrow) return arrow.isInBlock(); return false; } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java index d404f262..2bb35f74 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/utils/WorldeditWrapper.java @@ -82,8 +82,7 @@ public class WorldeditWrapper { for (int z = 0; z < clipboard.getDimensions().z(); z++) { BlockVector3 pos = minimum.add(x, y, z); BaseBlock replacement = replaceMap.get(clipboard.getFullBlock(pos)); - if (replacement != null) - clipboard.setBlock(pos, replacement); + if (replacement != null) clipboard.setBlock(pos, replacement); } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java index 79fdfdc8..b91ba2d2 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/Wincondition.java @@ -48,8 +48,7 @@ public abstract class Wincondition { } public static Countdown getTimeOverCountdown() { - if (timeOverCountdown == null) - return null; + if (timeOverCountdown == null) return null; return timeOverCountdown.getCountdown(); } @@ -58,8 +57,7 @@ public abstract class Wincondition { } protected FightTeam isTarget(Entity player) { - if (!(player instanceof LivingEntity)) - return null; + if (!(player instanceof LivingEntity)) return null; return Fight.getPlayerTeam((LivingEntity) player); } @@ -67,9 +65,10 @@ public abstract class Wincondition { protected void comparisonWin(ToDoubleFunction evaluate, String winMessage, String tieMessage) { double max = Fight.teams().stream().mapToDouble(evaluate).max().orElseThrow(() -> new SecurityException("No teams present")); List teams = Fight.teams().stream().filter(team -> evaluate.applyAsDouble(team) == max).collect(Collectors.toList()); - if (teams.size() > 1) + if (teams.size() > 1) { win(null, tieMessage); - else + } else { win(teams.get(0), winMessage, teams.get(0).getColoredName()); + } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java index 41a261a5..d859668b 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAllDead.java @@ -40,8 +40,7 @@ public class WinconditionAllDead extends Wincondition implements Listener { public void handlePlayerDeath(TeamDeathEvent event) { FightTeam team = event.getFightPlayer().getTeam(); - if (team.getAlivePlayers() > 0) - return; + if (team.getAlivePlayers() > 0) return; win(Fight.getOpposite(team), "WIN_ALL_DEAD", team.getPrefix()); } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java index f90e0411..27f53d6d 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionAmongUs.java @@ -76,8 +76,7 @@ public class WinconditionAmongUs extends Wincondition implements Listener { private void handleDeath(Player player) { FightTeam team = isTarget(player); - if (team == null) - return; + if (team == null) return; FightPlayer current = team.getFightPlayer(player); if (current == imposter.get(team)) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java index a601b690..4e142cb2 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBasePercent.java @@ -112,8 +112,9 @@ public abstract class WinconditionBasePercent extends Wincondition implements Pr totalBlocks = 0; countAnyBlock = false; team.getSchemRegion().forEach((x, y, z) -> { - if (Config.GameModeConfig.WinConditionParams.Blocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist) + if (Config.GameModeConfig.WinConditionParams.Blocks.contains(Config.world.getBlockAt(x, y, z).getType()) == Config.GameModeConfig.WinConditionParams.BlocksWhitelist) { totalBlocks++; + } }); // Edge Case for DirtBlock if (totalBlocks == 0) { diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java index 1fbea1ad..8785e9b4 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionBlocks.java @@ -56,8 +56,9 @@ public abstract class WinconditionBlocks extends Wincondition implements Printab } }; - if (Config.GameModeConfig.WinConditions.contains(wincondition)) + if (Config.GameModeConfig.WinConditions.contains(wincondition)) { printableWinconditions.add(this); + } } @Override @@ -77,8 +78,9 @@ public abstract class WinconditionBlocks extends Wincondition implements Printab blocks.clear(); team.getExtendRegion().forEach((x, y, z) -> { Block block = Config.world.getBlockAt(x, y, z); - if (isOfType.test(block)) + if (isOfType.test(block)) { blocks.add(block); + } }); } @@ -87,8 +89,9 @@ public abstract class WinconditionBlocks extends Wincondition implements Printab if (blocks.isEmpty()) return; blocks.removeIf(block -> !isOfType.test(block)); - if (blocks.isEmpty()) + if (blocks.isEmpty()) { win(Fight.getOpposite(team), "WIN_TECHKO", team.getColoredName()); + } } } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java index b559d88b..d9c1e826 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionCaptainDead.java @@ -40,8 +40,7 @@ public class WinconditionCaptainDead extends Wincondition implements Listener { @EventHandler public void handlePlayerDeath(TeamDeathEvent event) { FightPlayer leader = event.getFightPlayer(); - if (!leader.isLeader()) - return; + if (!leader.isLeader()) return; FightTeam team = leader.getTeam(); win(Fight.getOpposite(team), "WIN_LEADER_DEAD", team.getPrefix() + leader.getEntity().getName()); diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java index 15e70e86..e70b155e 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java @@ -74,24 +74,22 @@ public class WinconditionPoints extends WinconditionBasePercent implements Liste private void handleDeath(Player player) { FightTeam team = isTarget(player); - if (team == null) - return; + if (team == null) return; TeamPoints enemy = teamMap.get(Fight.getOpposite(team)); if (team.isPlayerLeader(player)) { enemy.points += 500; timeOver(); - } else if (team.getPlayers().size() <= 5) + } else if (team.getPlayers().size() <= 5) { enemy.points += 300; - else + } else { enemy.points += 200; - + } } private void pointInit(FightTeam team) { TeamPoints opponent = teamMap.get(Fight.getOpposite(team)); - if (getTotalBlocks(team) == 0) - return; + if (getTotalBlocks(team) == 0) return; teamMap.get(team).setup(getTotalBlocks(Fight.getOpposite(team))); opponent.setup(getTotalBlocks(team)); @@ -120,10 +118,11 @@ public class WinconditionPoints extends WinconditionBasePercent implements Liste } else { double f = 100.0 * getTotalBlocks(team) / enemyBlocks; - if (f > 100) + if (f > 100) { f = 100; - else if (f < 40) + } else if (f < 40) { f = 40; + } this.factor = f; } @@ -131,8 +130,7 @@ public class WinconditionPoints extends WinconditionBasePercent implements Liste public int getPoints() { int damagePoints = (int) (getPercent(Fight.getOpposite(team)) * factor); - if (damagePoints > MAX_POINTS) - damagePoints = MAX_POINTS; + if (damagePoints > MAX_POINTS) damagePoints = MAX_POINTS; return points + damagePoints; } } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java index 76bc0938..c2cf7b2e 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionPointsAirShip.java @@ -84,8 +84,7 @@ public class WinconditionPointsAirShip extends WinconditionBasePercent implement teamMap.get(team).points += 1; possibleEnd.compareAndSet(false, teamMap.get(team).getPoints() >= TeamPoints.WIN_POINTS); }); - if (possibleEnd.get()) - end(); + if (possibleEnd.get()) end(); } @EventHandler @@ -100,20 +99,17 @@ public class WinconditionPointsAirShip extends WinconditionBasePercent implement private void handleDeath(Player player) { FightTeam team = isTarget(player); - if (team == null) - return; + if (team == null) return; TeamPoints enemy = teamMap.get(Fight.getOpposite(team)); enemy.points += 200.0 / team.getPlayerCount(); - if (enemy.getPoints() >= TeamPoints.WIN_POINTS) - end(); + if (enemy.getPoints() >= TeamPoints.WIN_POINTS) end(); } private void pointInit(FightTeam team) { TeamPoints opponent = teamMap.get(Fight.getOpposite(team)); - if (getTotalBlocks(team) == 0) - return; + if (getTotalBlocks(team) == 0) return; teamMap.get(team).setup(getTotalBlocks(Fight.getOpposite(team))); opponent.setup(getTotalBlocks(team)); diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java index 0ab98d05..c75bb918 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimeTechKO.java @@ -72,8 +72,7 @@ public class WinconditionTimeTechKO extends Wincondition implements Listener { @EventHandler public void onSpawn(EntitySpawnEvent e) { - if (e.getEntityType() != EntityType.TNT) - return; + if (e.getEntityType() != EntityType.TNT) return; Location location = e.getLocation(); for (FightTeam team : Fight.teams()) { @@ -86,20 +85,17 @@ public class WinconditionTimeTechKO extends Wincondition implements Listener { @EventHandler public void onExplode(EntityExplodeEvent e) { - if (e.getEntityType() != EntityType.TNT) - return; + if (e.getEntityType() != EntityType.TNT) return; FightTeam spawn = spawnLocations.remove(e.getEntity().getEntityId()); - if (spawn == null) - return; + if (spawn == null) return; Location location = e.getLocation(); for (FightTeam team : Fight.teams()) { if (team != spawn && team.getExtendRegion().inRegion(location)) { currentTime.put(spawn, TECH_KO_HALF_TIME); TechKOCountdown countdown = countdowns.remove(spawn); - if (countdown != null) - countdown.disable(); + if (countdown != null) countdown.disable(); } } } @@ -107,8 +103,9 @@ public class WinconditionTimeTechKO extends Wincondition implements Listener { private void run() { currentTime.entrySet().forEach(entry -> { entry.setValue(entry.getValue() - 1); - if (entry.getValue() == 0) + if (entry.getValue() == 0) { countdowns.put(entry.getKey(), new TechKOCountdown(entry.getKey(), TECH_KO_HALF_TIME)); + } }); } diff --git a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java index c0c0407b..cefe292a 100644 --- a/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java +++ b/FightSystem/FightSystem_Core/src/de/steamwar/fightsystem/winconditions/WinconditionTimedDamageTechKO.java @@ -72,8 +72,7 @@ public class WinconditionTimedDamageTechKO extends Wincondition implements Print @EventHandler public void onExplode(EntityExplodeEvent e) { - if (e.getEntityType() != EntityType.TNT) - return; + if (e.getEntityType() != EntityType.TNT) return; Location location = e.getLocation(); TechKOCountdown countdown = null; diff --git a/LobbySystem/src/de/steamwar/lobby/Fightserver.java b/LobbySystem/src/de/steamwar/lobby/Fightserver.java index c2be5fc8..625d2dba 100644 --- a/LobbySystem/src/de/steamwar/lobby/Fightserver.java +++ b/LobbySystem/src/de/steamwar/lobby/Fightserver.java @@ -76,8 +76,7 @@ public class Fightserver { private void setupPortal(String gameMode) { FightserverPortal portal = FightserverPortal.findFree(gameMode); - if (portal == null) - return; + if (portal == null) return; portals.add(portal); portal.setServer(this); @@ -107,8 +106,7 @@ public class Fightserver { } private void update(T old, T current, Consumer observer) { - if (!old.equals(current)) - portals.forEach(observer); + if (!old.equals(current)) portals.forEach(observer); } private void remove() { diff --git a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java index 23c8466e..01b8f0c1 100644 --- a/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java +++ b/LobbySystem/src/de/steamwar/lobby/command/HologramCommand.java @@ -60,8 +60,7 @@ public class HologramCommand extends SWCommand { if (PortalCommand.noPermissions(player)) return; Hologram hologram = Hologram.getHologram(id); - if (hologram == null) - return; + if (hologram == null) return; hologram.delete(); LobbySystem.config().save(); diff --git a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java index a4c981bc..8e8f9d99 100644 --- a/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java +++ b/LobbySystem/src/de/steamwar/lobby/command/ModifyCommand.java @@ -82,8 +82,7 @@ public class ModifyCommand extends SWCommand implements Listener { @Register("waitinghallspawn") public void setWaitingHallSpawn(Player player) { SteamwarUser user = SteamwarUser.get(player.getUniqueId()); - if (!user.hasPerm(UserPerm.ADMINISTRATION)) - return; + if (!user.hasPerm(UserPerm.ADMINISTRATION)) return; LobbySystem.config().setWaitingHallSpawn(player.getLocation()); } diff --git a/LobbySystem/src/de/steamwar/lobby/display/Hologram.java b/LobbySystem/src/de/steamwar/lobby/display/Hologram.java index 3fe11a0d..f18cdb2d 100644 --- a/LobbySystem/src/de/steamwar/lobby/display/Hologram.java +++ b/LobbySystem/src/de/steamwar/lobby/display/Hologram.java @@ -57,8 +57,7 @@ public class Hologram implements ConfigurationSerializable { entity.setInvisible(true); entity.setDisplayName(text); - if (id != null) - holograms.put(id, this); + if (id != null) holograms.put(id, this); } public void updateText(String text) { @@ -76,8 +75,7 @@ public class Hologram implements ConfigurationSerializable { public void delete() { entity.die(); - if (id != null) - holograms.remove(id); + if (id != null) holograms.remove(id); } @Override diff --git a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java index bf6a143d..63e68e01 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/AlphaWall.java @@ -48,8 +48,7 @@ public class AlphaWall implements Listener { @EventHandler public void onMove(PlayerMoveEvent event) { Player player = event.getPlayer(); - if (ModifyCommand.modifying(player) || allowed.apply(event.getTo())) - return; + if (ModifyCommand.modifying(player) || allowed.apply(event.getTo())) return; Location to = event.getFrom().clone(); to.setYaw(reflect - to.getYaw()); diff --git a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java index 8178cdfa..bc64a82c 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/InventoryInteraction.java @@ -42,8 +42,7 @@ public class InventoryInteraction implements Listener { @EventHandler public void handlePlayerInteract(PlayerInteractEvent event) { ItemStack item = event.getItem(); - if (item == null) - return; + if (item == null) return; if (item.getType() == Material.FIREWORK_ROCKET && (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK)) { int offset; @@ -59,8 +58,7 @@ public class InventoryInteraction implements Listener { return; } - if (!ModifyCommand.modifying(event.getPlayer())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } @EventHandler @@ -75,14 +73,12 @@ public class InventoryInteraction implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void handleInventoryClick(InventoryClickEvent event) { - if (!ModifyCommand.modifying(event.getWhoClicked())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getWhoClicked())) event.setCancelled(true); } @EventHandler public void handlePlayerSwapHandItemsEvent(PlayerSwapHandItemsEvent event) { - if (!ModifyCommand.modifying(event.getPlayer())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } } diff --git a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java index dbd3596e..3e452b30 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/PlayerSeatListener.java @@ -59,34 +59,29 @@ public class PlayerSeatListener implements Listener { @EventHandler public void onPlayerInteract(PlayerInteractEvent event) { - if (event.getPlayer().isGliding()) - return; + if (event.getPlayer().isGliding()) return; - if (event.getAction() != Action.RIGHT_CLICK_BLOCK) - return; + if (event.getAction() != Action.RIGHT_CLICK_BLOCK) return; - if (!event.getClickedBlock().getType().name().toLowerCase().contains("stairs")) - return; + if (!event.getClickedBlock().getType().name().toLowerCase().contains("stairs")) return; - if (event.getPlayer().getGameMode() != GameMode.ADVENTURE && event.getPlayer().getGameMode() != GameMode.SURVIVAL) + if (event.getPlayer().getGameMode() != GameMode.ADVENTURE && event.getPlayer().getGameMode() != GameMode.SURVIVAL) { return; + } - if (((Stairs) event.getClickedBlock().getBlockData()).getHalf() != Bisected.Half.BOTTOM) - return; + if (((Stairs) event.getClickedBlock().getBlockData()).getHalf() != Bisected.Half.BOTTOM) return; - if (((Stairs) event.getClickedBlock().getBlockData()).getShape() != Stairs.Shape.STRAIGHT) - return; + if (((Stairs) event.getClickedBlock().getBlockData()).getShape() != Stairs.Shape.STRAIGHT) return; - if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle())) + if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle())) { event.getPlayer().getVehicle().remove(); + } - if (event.getClickedBlock().getRelative(0, 1, 0).getType() != Material.AIR) - return; + if (event.getClickedBlock().getRelative(0, 1, 0).getType() != Material.AIR) return; Location location = event.getClickedBlock().getLocation(); Location seatLocation = getSeatLocation(location); - if (seats.contains(seatLocation)) - return; + if (seats.contains(seatLocation)) return; seats.add(seatLocation); Arrow arrow = (Arrow) event.getPlayer().getWorld().spawnEntity(location.add(0.5, 0, 0.5), EntityType.ARROW); @@ -100,16 +95,16 @@ public class PlayerSeatListener implements Listener { public void onEntityDismount(EntityDismountEvent event) { seats.remove(getSeatLocation(event.getDismounted().getLocation())); - if (event.getEntityType() != EntityType.PLAYER && !isArrow(event.getDismounted())) - return; + if (event.getEntityType() != EntityType.PLAYER && !isArrow(event.getDismounted())) return; event.getDismounted().remove(); } @EventHandler public void onPlayerQuit(PlayerQuitEvent event) { - if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle())) + if (event.getPlayer().isInsideVehicle() && isArrow(event.getPlayer().getVehicle())) { event.getPlayer().getVehicle().remove(); + } } public Location getSeatLocation(Location location) { diff --git a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java index d1a688dc..160d8439 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/Portals.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/Portals.java @@ -55,13 +55,11 @@ public class Portals implements Listener { assert to != null; Portal portal = Portal.getPortal(from, to); - if (portal == null) - return; + if (portal == null) return; Player player = e.getPlayer(); Deque lastPortals = portalStack.get(player); - if (!lastPortals.isEmpty() && lastPortals.peek() == portal) - return; + if (!lastPortals.isEmpty() && lastPortals.peek() == portal) return; portal.handle(player, from, to); } diff --git a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java index 878a2482..ead9284f 100644 --- a/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java +++ b/LobbySystem/src/de/steamwar/lobby/listener/WorldInteraction.java @@ -71,29 +71,28 @@ public class WorldInteraction implements Listener { @EventHandler public void handleBlockBreak(BlockBreakEvent event) { - if (!ModifyCommand.modifying(event.getPlayer())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } @EventHandler public void handleBlockPlace(BlockPlaceEvent event) { - if (!ModifyCommand.modifying(event.getPlayer())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } @EventHandler public void handleHangingBreak(HangingBreakByEntityEvent event) { - if (!ModifyCommand.modifying((HumanEntity) event.getRemover())) - event.setCancelled(true); + if (!ModifyCommand.modifying((HumanEntity) event.getRemover())) event.setCancelled(true); } @EventHandler public void handleGoldenPressurePlate(PlayerInteractEvent event) { - if (!ModifyCommand.modifying(event.getPlayer()) && (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) + if (!ModifyCommand.modifying(event.getPlayer()) && (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.LEFT_CLICK_BLOCK)) { event.setCancelled(true); + } - if (!event.hasBlock() || event.getAction() != Action.PHYSICAL || event.getClickedBlock().getType() != Material.LIGHT_WEIGHTED_PRESSURE_PLATE) + if (!event.hasBlock() || event.getAction() != Action.PHYSICAL || event.getClickedBlock().getType() != Material.LIGHT_WEIGHTED_PRESSURE_PLATE) { return; + } Player player = event.getPlayer(); player.setVelocity(player.getLocation().getDirection().multiply(5).add(new Vector(0, 1, 0))); @@ -106,8 +105,7 @@ public class WorldInteraction implements Listener { @EventHandler public void onPlayerArmorStandManipulate(PlayerArmorStandManipulateEvent event) { - if (!ModifyCommand.modifying(event.getPlayer())) - event.setCancelled(true); + if (!ModifyCommand.modifying(event.getPlayer())) event.setCancelled(true); } } diff --git a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java index 4faa1e31..dab45e8a 100644 --- a/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java +++ b/LobbySystem/src/de/steamwar/lobby/portal/CommandPortal.java @@ -52,8 +52,7 @@ public class CommandPortal implements PortalHandler { int maxId = 0; for (int i = 1; i < parts.length; i++) { stackIds[i - 1] = Integer.parseInt(parts[i].substring(0, 1)); - if (stackIds[i - 1] > maxId) - maxId = stackIds[i - 1]; + if (stackIds[i - 1] > maxId) maxId = stackIds[i - 1]; } Iterator stack = Portals.getStack(player).iterator(); @@ -82,8 +81,9 @@ public class CommandPortal implements PortalHandler { cmd.append(pieces[i]).append(parts[i + 1].substring(1)); } - if (ModifyCommand.modifying(player)) + if (ModifyCommand.modifying(player)) { player.sendMessage("/" + cmd); + } NetworkSender.send(new ExecuteCommandPacket(SteamwarUser.get(player.getUniqueId()).getId(), cmd.toString())); } diff --git a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java index 7455b4d8..8919d0ce 100644 --- a/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java +++ b/LobbySystem/src/de/steamwar/lobby/portal/FightserverPortal.java @@ -40,8 +40,7 @@ public class FightserverPortal implements PortalHandler, Comparable list = portals.getOrDefault(gamemode, Collections.emptyList()); for (FightserverPortal portal : list) { - if (portal.server == null) - return portal; + if (portal.server == null) return portal; } return null; } @@ -107,10 +106,11 @@ public class FightserverPortal implements PortalHandler, Comparable " + target.getId()); + } Vector normalized = portal.normalize(to); if (target.getDepth() != 0.0) { diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java index 27158d63..743abc3b 100644 --- a/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java +++ b/LobbySystem/src/de/steamwar/lobby/special/advent/AdventListener.java @@ -42,8 +42,7 @@ public class AdventListener implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void handlePlayerInteract(PlayerInteractEvent event) { ItemStack item = event.getItem(); - if (item == null) - return; + if (item == null) return; if (item.getType() == Material.PLAYER_HEAD && item.getItemMeta() != null && item.getItemMeta().getDisplayName().equals("§fAdvent")) { event.getPlayer().performCommand("advent"); diff --git a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java index 4be340d1..85354c42 100644 --- a/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java +++ b/LobbySystem/src/de/steamwar/lobby/special/advent/PresentClickListener.java @@ -44,8 +44,9 @@ public class PresentClickListener implements Listener { } AdventsCalendar.getPresentList().forEach(present -> { if (present.getDay() != day) return; - if (NodeMember.getNodeMember(present.getSchematicId(), SteamwarUser.get(event.getPlayer().getUniqueId()).getId()) != null) + if (NodeMember.getNodeMember(present.getSchematicId(), SteamwarUser.get(event.getPlayer().getUniqueId()).getId()) != null) { return; + } LobbySystem.getMessage().send("ADVENT_CALENDAR_MESSAGE", event.getPlayer()); }); } diff --git a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java index e2a345bb..dbd26b02 100644 --- a/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java +++ b/LobbySystem/src/de/steamwar/lobby/special/easter/EggHuntListener.java @@ -42,8 +42,7 @@ public class EggHuntListener implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void handlePlayerInteract(PlayerInteractEvent event) { ItemStack item = event.getItem(); - if (item == null) - return; + if (item == null) return; if (item.getType() == Material.DRAGON_EGG && item.getItemMeta() != null && item.getItemMeta().getDisplayName().equals("§fEaster Hunt")) { event.getPlayer().performCommand("egg"); diff --git a/MissileWars/src/de/steamwar/misslewars/MWTeam.java b/MissileWars/src/de/steamwar/misslewars/MWTeam.java index ad2bda5b..76c87213 100644 --- a/MissileWars/src/de/steamwar/misslewars/MWTeam.java +++ b/MissileWars/src/de/steamwar/misslewars/MWTeam.java @@ -179,8 +179,9 @@ public class MWTeam { p.getInventory().setItem(0, bow); sbteam.addPlayer(p); p.setDisplayName(color + p.getName()); - if (MissileWars.getFightState() == FightState.WAITING && !enemy().players.isEmpty()) + if (MissileWars.getFightState() == FightState.WAITING && !enemy().players.isEmpty()) { MissileWars.startRound(); + } } public void leave(Player p) { diff --git a/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java b/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java index 50e2f26c..16a85836 100644 --- a/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java +++ b/MissileWars/src/de/steamwar/misslewars/SpawnPlatformCreator.java @@ -56,8 +56,7 @@ public class SpawnPlatformCreator { if (currentBlock == null || !currentBlock.getLocation().equals(playerLoc)) { if (currentBlock != null) { - if (currentBlock.getType() == Material.OBSIDIAN) - currentBlock.setType(Material.AIR); + if (currentBlock.getType() == Material.OBSIDIAN) currentBlock.setType(Material.AIR); currentBlock = null; } diff --git a/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java b/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java index 18bbb3c7..1c3a5272 100644 --- a/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java +++ b/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java @@ -105,8 +105,7 @@ public class AutoChecker { } List items = nbt.getList("Items", CompoundTag.class); - if (items.isEmpty()) - return; // Leeres Inventar + if (items.isEmpty()) return; // Leeres Inventar int counter = 0; int windChargeCount = 0; diff --git a/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java b/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java index c7f29474..a63fb70b 100644 --- a/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java +++ b/SchematicSystem/src/de/steamwar/schematicsystem/autocheck/AutoCheckerResult.java @@ -117,12 +117,15 @@ public class AutoCheckerResult { public void sendErrorMessage(Player p, String schemName) { SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEADER", p, schemName); - if (isTooWide()) + if (isTooWide()) { SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_WIDTH", p, width, type.Schematic.Size.x); - if (isTooHigh()) + } + if (isTooHigh()) { SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_HEIGHT", p, height, type.Schematic.Size.y); - if (isTooDeep()) + } + if (isTooDeep()) { SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_LENGTH", p, depth, type.Schematic.Size.z); + } if (type.Schematic.MaxBlocks != 0 && !isBlockCountOk()) { SchematicSystem.MESSAGE.sendPrefixless("AUTO_CHECKER_RESULT_BLOCKS", p, blockScanResult.getBlockCounts().values().stream().reduce(Integer::sum).orElse(0), type.Schematic.MaxBlocks); } diff --git a/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java b/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java index f232b1fd..10b53f92 100644 --- a/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java +++ b/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/GUI.java @@ -297,8 +297,7 @@ public class GUI { SWInventory inv = new SWInventory(p, 9, SchematicSystem.MESSAGE.parse("GUI_DELETE_MEMBER_TITLE", p, schem.generateBreadcrumbs(user))); inv.setItem(0, Material.RED_DYE, (byte) 1, SchematicSystem.MESSAGE.parse("CONFIRM", p), click -> { NodeMember member = NodeMember.getNodeMember(schem.getId(), user.getId()); - if (member != null) - member.delete(); + if (member != null) member.delete(); SchematicSystem.MESSAGE.send("GUI_DELETE_MEMBER_DONE", p, schem.generateBreadcrumbs(user)); if (back != null) { if (schem.isDir()) { @@ -314,10 +313,11 @@ public class GUI { } static void delete(Player p, SchematicNode schem, SchematicSelector back) { - if (SteamwarUser.get(p.getUniqueId()).getId() == schem.getOwner()) + if (SteamwarUser.get(p.getUniqueId()).getId() == schem.getOwner()) { deleteOwn(p, schem, back); - else + } else { deleteMembership(p, schem, back); + } } static void delmembers(Player p, SchematicNode schem) { diff --git a/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java b/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java index 88fcfd35..d28af5b5 100644 --- a/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java +++ b/SchematicSystem/src/de/steamwar/schematicsystem/commands/schematiccommand/parts/SavePart.java @@ -100,14 +100,12 @@ public class SavePart extends SWCommand { SchematicData.saveFromPlayer(player, node); } catch (NoClipboardException e) { SchematicSystem.MESSAGE.send("COMMAND_SAVE_CLIPBOARD_EMPTY", player); - if (newSchem) - node.delete(); + if (newSchem) node.delete(); return; } catch (Exception ex) { Bukkit.getLogger().log(Level.SEVERE, "Could not save schematic", ex); SchematicSystem.MESSAGE.send("COMMAND_SAVE_ERROR", player); - if (newSchem) - node.delete(); + if (newSchem) node.delete(); return; } diff --git a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java index fda96c66..59def653 100644 --- a/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java +++ b/SpigotCore/SpigotCore_Main/src/com/comphenix/tinyprotocol/TinyProtocol.java @@ -165,8 +165,7 @@ public class TinyProtocol { @EventHandler(priority = EventPriority.LOWEST) public final void onPlayerLogin(PlayerLoginEvent e) { - if (closed) - return; + if (closed) return; Channel channel = getChannel(e.getPlayer()); @@ -201,8 +200,7 @@ public class TinyProtocol { List list = Reflection.getField(serverConnection.getClass(), List.class, i).get(serverConnection); for (Object item : list) { - if (!(item instanceof ChannelFuture)) - break; + if (!(item instanceof ChannelFuture)) break; // Channel future that contains the server connection Channel serverChannel = ((ChannelFuture) item).channel(); @@ -215,8 +213,7 @@ public class TinyProtocol { } private void unregisterChannelHandler() { - if (serverChannelHandler == null) - return; + if (serverChannelHandler == null) return; for (Channel serverChannel : serverChannels) { final ChannelPipeline pipeline = serverChannel.pipeline(); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java index 99107cca..d75fdae7 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/Reflection.java @@ -226,25 +226,25 @@ public final class Reflection { } // Search in parent classes - if (target.getSuperclass() != null) + if (target.getSuperclass() != null) { return getField(target.getSuperclass(), name, fieldType, index); + } throw new IllegalArgumentException("Cannot find field with type " + fieldType); } private static boolean matching(java.lang.reflect.Field field, String name, Class fieldType, Class... parameters) { - if (name != null && !field.getName().equals(name)) - return false; + if (name != null && !field.getName().equals(name)) return false; - if (!fieldType.isAssignableFrom(field.getType())) - return false; + if (!fieldType.isAssignableFrom(field.getType())) return false; if (parameters.length > 0) { Type[] arguments = ((ParameterizedType) field.getGenericType()).getActualTypeArguments(); for (int i = 0; i < parameters.length; i++) { - if (arguments[i] instanceof ParameterizedType ? ((ParameterizedType) arguments[i]).getRawType() != parameters[i] : arguments[i] != parameters[i]) + if (arguments[i] instanceof ParameterizedType ? ((ParameterizedType) arguments[i]).getRawType() != parameters[i] : arguments[i] != parameters[i]) { return false; + } } } return true; @@ -274,8 +274,9 @@ public final class Reflection { } // Search in every superclass - if (clazz.getSuperclass() != null) + if (clazz.getSuperclass() != null) { return getTypedMethod(clazz.getSuperclass(), methodName, returnType, params); + } throw new IllegalArgumentException(String.format("Cannot find method %s (%s).", methodName, Arrays.asList(params))); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java index 61651e3b..a1aefd55 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/Core.java @@ -131,7 +131,6 @@ public class Core extends JavaPlugin { public void onDisable() { TinyProtocol.instance.close(); errorHandler.unregister(); - if (crashDetector.onMainThread()) - Statement.closeAll(); + if (crashDetector.onMainThread()) Statement.closeAll(); } } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java index d8d224e3..f60eb406 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/ErrorHandler.java @@ -51,29 +51,30 @@ public class ErrorHandler extends Handler { @Override @SuppressWarnings("deprecation") public void publish(LogRecord logRecord) { - if (logRecord.getLevel().intValue() < Level.WARNING.intValue()) - return; + if (logRecord.getLevel().intValue() < Level.WARNING.intValue()) return; - if (watchdogThreadId == logRecord.getThreadID()) - return; + if (watchdogThreadId == logRecord.getThreadID()) return; String message = logRecord.getMessage() != null ? logRecord.getMessage() : ""; - for (String reason : ignoreStartsWith) - if (message.startsWith(reason)) - return; - for (String reason : ignoreContains) - if (message.contains(reason)) - return; + for (String reason : ignoreStartsWith) { + if (message.startsWith(reason)) return; + } + for (String reason : ignoreContains) { + if (message.contains(reason)) return; + } ByteArrayOutputStream stacktraceOutput = new ByteArrayOutputStream(); - if (logRecord.getThrown() != null) + if (logRecord.getThrown() != null) { logRecord.getThrown().printStackTrace(new PrintStream(stacktraceOutput)); + } String stacktrace = stacktraceOutput.toString(); - if (stacktrace.contains("POI data mismatch") || stacktrace.contains("Newer version! Server downgrades are not supported!")) + if (stacktrace.contains("POI data mismatch") || stacktrace.contains("Newer version! Server downgrades are not supported!")) { return; + } - if (message.isEmpty() && stacktrace.isEmpty()) + if (message.isEmpty() && stacktrace.isEmpty()) { return; + } try { SWException.log(message, stacktrace); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java index d218691c..692c2031 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/SWPlayer.java @@ -153,8 +153,9 @@ public class SWPlayer { private Message getMessage() { Message message = this.messageThreadLocal.get(); - if (message == null) + if (message == null) { throw new IllegalStateException("Use #using(Message) before sending or parsing a message!"); + } return message; } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java index a271b00b..fb66e5e9 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/TPSWatcher.java @@ -36,8 +36,9 @@ public class TPSWatcher { Bukkit.getScheduler().runTaskTimer(Core.getInstance(), () -> { long currentTime = System.currentTimeMillis(); - if (currentTime > lastTime) + if (currentTime > lastTime) { tps = (timeInterval / (double) (currentTime - lastTime)) * TICK_DEFAULT; + } lastTime = currentTime; }, timeInterval / 50, timeInterval / 50); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java index de575854..d333ff3f 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/WorldEditWrapper.java @@ -187,8 +187,7 @@ public class WorldEditWrapper { } Clipboard clipboard = clipboardHolder.getClipboard(); - if (clipboard == null) - throw new NoClipboardException(); + if (clipboard == null) throw new NoClipboardException(); PipedOutputStream outputStream = new PipedOutputStream(); PipedInputStream inputStream; diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java index 44ce52ca..858a2af0 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/core/events/AntiNocom.java @@ -78,13 +78,16 @@ public class AntiNocom implements Listener { } private boolean isValid(Player player, String type, int x, int z) { - if ((x == 0 && z == 0) || player.getWorld().isChunkLoaded(ProtocolUtils.posToChunk(x), ProtocolUtils.posToChunk(z))) + if ((x == 0 && z == 0) || player.getWorld().isChunkLoaded(ProtocolUtils.posToChunk(x), ProtocolUtils.posToChunk(z))) { return true; + } int amount = flags.compute(player, (p, a) -> a == null ? 1 : a + 1); if (amount % 8 == 0) { // Only after 8 and every 8 to reduce false flags and spam - if (amount == 8) // Schedule player kick only once + if (amount == 8) { + // Schedule player kick only once Bukkit.getScheduler().runTask(Core.getInstance(), () -> player.kickPlayer(null)); + } SWException.log(player.getName() + " kicked for potential NoCom-DOS attack", x + " " + z + " " + type + " " + amount); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java index b4480a7f..c2fb90c2 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/RArmorStand.java @@ -44,8 +44,9 @@ public class RArmorStand extends REntity { void spawn(Consumer packetSink) { super.spawn(packetSink); - if (size != null && size != Size.NORMAL) + if (size != null && size != Size.NORMAL) { packetSink.accept(getDataWatcherPacket(sizeWatcher, size.value)); + } } public enum Size { diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java index 285f3bac..8c241d3a 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntity.java @@ -123,8 +123,7 @@ public class REntity { } public void hide(boolean hide) { - if (hidden == hide) - return; + if (hidden == hide) return; if (hide) { despawn(packet -> server.updateEntity(this, packet)); @@ -160,8 +159,9 @@ public class REntity { if (Math.abs(diffX) < MAX_REL_MOVE && Math.abs(diffY) < MAX_REL_MOVE && Math.abs(diffZ) < MAX_REL_MOVE) { Object packet = getMoveLookPacket(diffX, diffY, diffZ, rotEq); - if (packet != null) + if (packet != null) { server.updateEntity(this, packet); + } } else { server.updateEntity(this, getTeleportPacket()); } @@ -321,15 +321,10 @@ public class REntity { private byte getEntityStatus() { byte status = 0; - if (fireTick != 0) - status |= 1; - if (pose == Pose.CROUCHING) - status |= 2; - if (invisible) - status |= 0x20; - if (isGlowing) - status |= 0x40; - + if (fireTick != 0) status |= 1; + if (pose == Pose.CROUCHING) status |= 2; + if (invisible) status |= 0x20; + if (isGlowing) status |= 0x40; return status; } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java index 3db83b6a..1a7532d8 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java @@ -56,11 +56,9 @@ public class REntityServer implements Listener { private final BiFunction filter = (player, packet) -> { REntity entity = entityMap.get(packet.getEntityId()); - if (entity == null) - return packet; + if (entity == null) return packet; - if (playersThatClicked.contains(player)) - return null; + if (playersThatClicked.contains(player)) return null; playersThatClicked.add(player); EntityAction action = packet.isAttack() ? EntityAction.ATTACK : EntityAction.INTERACT; @@ -79,8 +77,9 @@ public class REntityServer implements Listener { boolean uninitialized = this.callback == null; this.callback = callback; - if (uninitialized) + if (uninitialized) { TinyProtocol.instance.addTypedFilter(ServerboundInteractPacket.class, filter); + } } public void addPlayer(Player player) { @@ -120,11 +119,11 @@ public class REntityServer implements Listener { void preEntityMove(REntity entity, double toX, double toZ) { long fromId = entityToId(entity); long toId = posToId(toX, toZ); - if (fromId == toId) - return; + if (fromId == toId) return; - if (!entity.isHidden()) + if (!entity.isHidden()) { onMissing(players.get(fromId), players.get(toId), entity::despawn); + } onMissing(players.get(fromId), players.get(toId), entity::delist); removeEntityFromChunk(entity); } @@ -132,18 +131,17 @@ public class REntityServer implements Listener { void postEntityMove(REntity entity, double fromX, double fromZ) { long fromId = posToId(fromX, fromZ); long toId = entityToId(entity); - if (fromId == toId) - return; + if (fromId == toId) return; addEntityToChunk(entity); onMissing(players.get(toId), players.get(fromId), entity::list); - if (!entity.isHidden()) + if (!entity.isHidden()) { onMissing(players.get(toId), players.get(fromId), entity::spawn); + } } void updateEntity(REntity entity, Object packet) { - if (entity.isHidden()) - return; + if (entity.isHidden()) return; for (Player player : players.getOrDefault(entityToId(entity), emptyPlayers)) { TinyProtocol.instance.sendPacket(player, packet); @@ -174,8 +172,7 @@ public class REntityServer implements Listener { HashSet entitiesInChunk = entities.get(id); if (entitiesInChunk == null) return; entitiesInChunk.remove(entity); - if (entitiesInChunk.isEmpty()) - entities.remove(id); + if (entitiesInChunk.isEmpty()) entities.remove(id); } @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) @@ -183,15 +180,13 @@ public class REntityServer implements Listener { Player player = e.getPlayer(); Location from = lastLocation.get(player); Location to = e.getTo(); - if (from == null || to == null) - return; + if (from == null || to == null) return; int fromX = posToChunk(from.getX()); int fromZ = posToChunk(from.getZ()); int toX = posToChunk(to.getX()); int toZ = posToChunk(to.getZ()); - if (fromX == toX && fromZ == toZ) - return; + if (fromX == toX && fromZ == toZ) return; lastLocation.put(player, to); @@ -214,22 +209,19 @@ public class REntityServer implements Listener { public void onQuit(PlayerQuitEvent e) { Player player = e.getPlayer(); Location location = lastLocation.remove(player); - if (location == null) - return; + if (location == null) return; forChunkInView(player, location, (x, z) -> { long id = chunkToId(x, z); Set playersInChunk = players.get(id); playersInChunk.remove(player); - if (playersInChunk.isEmpty()) - players.remove(id); + if (playersInChunk.isEmpty()) players.remove(id); }); viewDistance.remove(player); } private void onMissing(Set of, Set in, Consumer> packetProvider) { - if (of == null) - return; + if (of == null) return; for (Player player : of) { if (in == null || !in.contains(player)) { @@ -255,8 +247,9 @@ public class REntityServer implements Listener { players.computeIfAbsent(id, i -> new HashSet<>()).add(player); for (REntity entity : entities.getOrDefault(id, emptyEntities)) { entity.list(packet -> TinyProtocol.instance.sendPacket(player, packet)); - if (!entity.isHidden()) + if (!entity.isHidden()) { entity.spawn(packet -> TinyProtocol.instance.sendPacket(player, packet)); + } } } @@ -265,12 +258,12 @@ public class REntityServer implements Listener { Set playersInChunk = players.get(id); playersInChunk.remove(player); - if (playersInChunk.isEmpty()) - players.remove(id); + if (playersInChunk.isEmpty()) players.remove(id); for (REntity entity : entities.getOrDefault(id, emptyEntities)) { - if (!entity.isHidden()) + if (!entity.isHidden()) { entity.despawn(packet -> TinyProtocol.instance.sendPacket(player, packet)); + } entity.delist(packet -> TinyProtocol.instance.sendPacket(player, packet)); } } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java index 218ebfad..0498110a 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWAnvilInv.java @@ -83,15 +83,13 @@ public class SWAnvilInv { private List onResult(Integer slot, AnvilGUI.StateSnapshot state) { if (slot != AnvilGUI.Slot.OUTPUT) { - if (slot == AnvilGUI.Slot.INPUT_LEFT && leftCallback != null) - leftCallback.run(); + if (slot == AnvilGUI.Slot.INPUT_LEFT && leftCallback != null) leftCallback.run(); return Collections.emptyList(); } String s = state.getText(); - if (s.startsWith("»")) - s = s.substring(1); + if (s.startsWith("»")) s = s.substring(1); callback.accept(s); player.setLevel(0); return Collections.singletonList(AnvilGUI.ResponseAction.close()); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java index be01c6a8..43051afa 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWInventory.java @@ -156,8 +156,7 @@ public class SWInventory implements Listener { @EventHandler public void onInventoryClick(InventoryClickEvent e) { - if (!player.equals(e.getWhoClicked())) - return; + if (!player.equals(e.getWhoClicked())) return; if (callbacks.containsKey(e.getRawSlot()) && callbacks.get(e.getRawSlot()) != null) { e.setCancelled(true); @@ -169,8 +168,7 @@ public class SWInventory implements Listener { @EventHandler public void onInventoryClose(InventoryCloseEvent e) { - if (!player.equals(e.getPlayer())) - return; + if (!player.equals(e.getPlayer())) return; InventoryClickEvent.getHandlerList().unregister(this); InventoryCloseEvent.getHandlerList().unregister(this); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java index 11f0899a..68ec243f 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWItem.java @@ -132,8 +132,9 @@ public class SWItem { item.setName(itemJson.get("title").getAsString()); } - if (itemJson.has("enchanted")) + if (itemJson.has("enchanted")) { item.setEnchanted(true); + } if (itemJson.has("lore")) { List lore = new ArrayList<>(); JsonArray loreArray = itemJson.getAsJsonArray("lore"); @@ -141,8 +142,9 @@ public class SWItem { item.setLore(lore); } - if (itemJson.has("customModelData")) + if (itemJson.has("customModelData")) { item.setCustomModelData(itemJson.get("customModelData").getAsInt()); + } return item; } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java index f6e08eb9..18065a72 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/SWListInv.java @@ -111,8 +111,7 @@ public class SWListInv extends SWInventory { @Override public void setItem(int pos, SWItem item) { super.setItem(pos, item); - if (!opened) - customItems.put(pos, item); + if (!opened) customItems.put(pos, item); } public void setCallback(ListCallback c) { @@ -122,8 +121,7 @@ public class SWListInv extends SWInventory { public static List> createPlayerList(UUID without) { List> onlinePlayers = new ArrayList<>(); for (Player player : Bukkit.getOnlinePlayers()) { - if (without != null && player.getUniqueId().equals(without)) - continue; + if (without != null && player.getUniqueId().equals(without)) continue; onlinePlayers.add(new SWListEntry<>(SWItem.getPlayerSkull(player), player.getUniqueId())); } @@ -134,17 +132,19 @@ public class SWListInv extends SWInventory { List> schemList = new ArrayList<>(); List schems; - if (type == null) + if (type == null) { schems = SchematicNode.getAllSchematicsAccessibleByUser(steamwarUserId); - else + } else { schems = SchematicNode.getAllAccessibleSchematicsOfType(steamwarUserId, type.toDB()); + } for (SchematicNode s : schems) { Material m; - if (s.getItem().isEmpty()) + if (s.getItem().isEmpty()) { m = Material.CAULDRON; - else + } else { m = SWItem.getMaterial(s.getItem()); + } SWItem item = new SWItem(m, "§e" + s.getName()); item.setEnchanted(s.isDir()); schemList.add(new SWListEntry<>(item, s)); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java index f7f92acf..e4d25263 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/inventory/UtilGui.java @@ -38,8 +38,7 @@ public class UtilGui { public static void openMaterialSelector(Player player, String title, Consumer callback) { List> materials = new LinkedList<>(); for (Material material : Material.values()) { - if (material.name().startsWith(Material.LEGACY_PREFIX) || !material.isItem()) - continue; + if (material.name().startsWith(Material.LEGACY_PREFIX) || !material.isItem()) continue; SWItem item = new SWItem(material, "§7" + material.name()); if (item.getItemMeta() != null && material.isItem()) { materials.add(new SWListInv.SWListEntry<>(item, material)); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java index 45558eba..ef6b33db 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/message/Message.java @@ -58,15 +58,15 @@ public class Message { private String parse(String message, boolean prefixed, CommandSender sender, Object... params) { Locale locale; - if (sender instanceof Player) + if (sender instanceof Player) { locale = getLocale((Player) sender); - else + } else { locale = Locale.getDefault(); + } ResourceBundle resourceBundle = ResourceBundle.getBundle(resourceBundleName, locale, classLoader); String pattern = ""; - if (prefixed) - pattern = fromRB(resourceBundle, "PREFIX") + " "; + if (prefixed) pattern = fromRB(resourceBundle, "PREFIX") + " "; pattern += fromRB(resourceBundle, message); for (int i = 0; i < params.length; i++) { @@ -115,15 +115,18 @@ public class Message { public void send(String message, boolean prefixed, CommandSender sender, ChatMessageType type, String onHover, ClickEvent onClick, Object... params) { TextComponent msg = parseToComponent(message, prefixed, sender, params); - if (onHover != null) + if (onHover != null) { msg.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, TextComponent.fromLegacyText(onHover))); - if (onClick != null) + } + if (onClick != null) { msg.setClickEvent(onClick); + } - if (sender instanceof Player) + if (sender instanceof Player) { BountifulWrapper.impl.sendMessage((Player) sender, type, msg); - else + } else { sender.sendMessage(msg.toPlainText()); + } } /* Send message to all players */ diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java index b1b903a5..0c82b3fb 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/network/handlers/InventoryHandler.java @@ -51,8 +51,9 @@ public class InventoryHandler extends PacketHandler { SWInventory inventory = new SWInventory(player, packet.getSize(), packet.getTitle(), items); inventory.addCloseCallback(click -> { - if (player.getOpenInventory().getType() != InventoryType.CHEST) + if (player.getOpenInventory().getType() != InventoryType.CHEST) { NetworkSender.send(InventoryCallbackPacket.builder().owner(packet.getPlayer()).type(InventoryCallbackPacket.CallbackType.CLOSE).build(), player); + } }); inventory.open(); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java index c7e91c14..4ebe5409 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/PersonalKit.java @@ -85,8 +85,7 @@ public class PersonalKit { public static PersonalKit get(int userID, String gamemode, String name) { InternalKit kit = InternalKit.get(userID, gamemode, name); - if (kit == null) - return null; + if (kit == null) return null; return new PersonalKit(kit); } @@ -97,8 +96,7 @@ public class PersonalKit { public static PersonalKit getKitInUse(int userID, String gamemode) { InternalKit kit = InternalKit.getKitInUse(userID, gamemode); - if (kit == null) - return null; + if (kit == null) return null; return new PersonalKit(kit); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java index 91fbff48..947d1adc 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java @@ -32,13 +32,11 @@ public class SchematicData { public SchematicData(SchematicNode node) { this.data = NodeData.getLatest(node); - if (node.isDir()) - throw new SecurityException("Node is Directory"); + if (node.isDir()) throw new SecurityException("Node is Directory"); } public SchematicData(SchematicNode node, int revision) { - if (node.isDir()) - throw new SecurityException("Node is Directory"); + if (node.isDir()) throw new SecurityException("Node is Directory"); if (revision < 1) { this.data = NodeData.getLatest(node); diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java index 5b454a11..7624ba53 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ChunkHider.java @@ -60,8 +60,9 @@ public class ChunkHider { return (p, packet) -> { int chunkX = chunkXField.get(packet); int chunkZ = chunkZField.get(packet); - if (techHider.getLocationEvaluator().skipChunk(p, chunkX, chunkZ)) + if (techHider.getLocationEvaluator().skipChunk(p, chunkX, chunkZ)) { return packet; + } packet = chunkPacketCloner.apply(packet); Object dataWrapper = chunkDataCloner.apply(chunkData.get(packet)); @@ -134,8 +135,9 @@ public class ChunkHider { case SKIP: break; case CHECK: - if (!section.getObfuscate().contains(values.get(pos))) + if (!section.getObfuscate().contains(values.get(pos))) { break; + } case HIDE: values.set(pos, section.getTarget()); break; @@ -243,8 +245,7 @@ public class ChunkHider { } int paletteLength = copyVarInt(); - if (paletteLength == 0) - return; + if (paletteLength == 0) return; paletted = true; air = 0; @@ -252,13 +253,15 @@ public class ChunkHider { for (int i = 0; i < paletteLength; i++) { int entry = ProtocolUtils.readVarInt(in); - if (obfuscate.contains(entry)) + if (obfuscate.contains(entry)) { entry = techHider.getObfuscationTargetId(); + } - if (entry == TechHider.AIR_ID) + if (entry == TechHider.AIR_ID) { air = i; - else if (entry == techHider.getObfuscationTargetId()) + } else if (entry == techHider.getObfuscationTargetId()) { target = i; + } ProtocolUtils.writeVarInt(out, entry); } diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java index 612a588a..1d340fd9 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolUtils.java @@ -70,17 +70,17 @@ public class ProtocolUtils { } private static BiConsumer shallowFill(Class clazz) { - if (clazz == null) + if (clazz == null) { return (source, clone) -> { }; + } BiConsumer superFiller = shallowFill(clazz.getSuperclass()); Field[] fds = clazz.getDeclaredFields(); List fields = new ArrayList<>(); for (Field field : fds) { - if (Modifier.isStatic(field.getModifiers())) - continue; + if (Modifier.isStatic(field.getModifiers())) continue; field.setAccessible(true); fields.add(field); @@ -101,8 +101,7 @@ public class ProtocolUtils { public static int posToChunk(int c) { int chunk = c / 16; - if (c < 0) - chunk--; + if (c < 0) chunk--; return chunk; } @@ -134,8 +133,7 @@ public class ProtocolUtils { int value = (read & 0b01111111); result |= (value << (7 * numRead)); - if (++numRead > 5) - throw new SecurityException("VarInt too long"); + if (++numRead > 5) throw new SecurityException("VarInt too long"); } while ((read & 0b10000000) != 0); return result; diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java index 659ff5de..fe8a4a8c 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/ProtocolWrapper.java @@ -43,8 +43,9 @@ public class ProtocolWrapper { int chunkX = TechHider.blockPositionX.get(chunkCoords); int chunkY = TechHider.blockPositionY.get(chunkCoords); int chunkZ = TechHider.blockPositionZ.get(chunkCoords); - if (locationEvaluator.skipChunkSection(p, chunkX, chunkY, chunkZ)) + if (locationEvaluator.skipChunkSection(p, chunkX, chunkY, chunkZ)) { return packet; + } packet = TechHider.multiBlockChangeCloner.apply(packet); final short[] oldPos = multiBlockChangePos.get(packet); @@ -68,8 +69,7 @@ public class ProtocolWrapper { } } - if (blocks.isEmpty()) - return null; + if (blocks.isEmpty()) return null; short[] newPos = new short[poss.size()]; for (int i = 0; i < newPos.length; i++) diff --git a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java index d843ab87..2c291091 100644 --- a/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java +++ b/SpigotCore/SpigotCore_Main/src/de/steamwar/techhider/TechHider.java @@ -107,8 +107,9 @@ public class TechHider { case SKIP: return packet; case CHECK: - if (!iBlockDataHidden((BlockState) blockChangeBlockData.get(packet))) + if (!iBlockDataHidden((BlockState) blockChangeBlockData.get(packet))) { return packet; + } case HIDE: packet = blockChangeCloner.apply(packet); blockChangeBlockData.set(packet, obfuscationTarget); @@ -125,8 +126,9 @@ public class TechHider { private static final Reflection.Field blockActionPosition = Reflection.getField(blockActionPacket, blockPosition, 0); private Object blockActionHider(Player p, Object packet) { - if (locationEvaluator.checkBlockPos(p, blockActionPosition.get(packet)) == State.SKIP) + if (locationEvaluator.checkBlockPos(p, blockActionPosition.get(packet)) == State.SKIP) { return packet; + } return null; } @@ -138,8 +140,9 @@ public class TechHider { case SKIP: return packet; case CHECK: - if (ProtocolWrapper.impl.unfilteredTileEntityDataAction(packet)) + if (ProtocolWrapper.impl.unfilteredTileEntityDataAction(packet)) { return packet; + } default: return null; } diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java index c328c385..fd4e4f97 100644 --- a/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java +++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Persistent.java @@ -195,26 +195,28 @@ public class Persistent { CommandManager commandManager = proxy.getCommandManager(); for (String alias : commandManager.getAliases()) { CommandMeta meta = commandManager.getCommandMeta(alias); - if (meta != null && meta.getPlugin() == plugin) + if (meta != null && meta.getPlugin() == plugin) { commandManager.unregister(meta); + } } proxy.getEventManager().unregisterListeners(plugin); proxy.getScheduler().tasksByPlugin(plugin).forEach(ScheduledTask::cancel); container.getExecutorService().shutdown(); - if (!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS)) + if (!container.getExecutorService().awaitTermination(100, TimeUnit.MILLISECONDS)) { logger.log(Level.WARNING, "ExecutorService termination took longer than 100ms, continuing."); + } for (Thread thread : Thread.getAllStackTraces().keySet()) { - if (thread.getClass().getClassLoader() != classLoader) - continue; + if (thread.getClass().getClassLoader() != classLoader) continue; thread.interrupt(); thread.join(100); - if (thread.isAlive()) + if (thread.isAlive()) { logger.log(Level.WARNING, "Could not stop thread %s of plugin %s. Still running".formatted(thread.getName(), container.getDescription().getId())); + } } //TODO close all log handlers diff --git a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java index 2b62f446..b429e772 100644 --- a/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java +++ b/VelocityCore/Persistent/src/de/steamwar/persistent/Subserver.java @@ -65,8 +65,7 @@ public class Subserver { public static Subserver getSubserver(Player p) { synchronized (serverList) { for (int i = serverList.size() - 1; i >= 0; i--) { - if (serverList.get(i).onServer(p)) - return serverList.get(i); + if (serverList.get(i).onServer(p)) return serverList.get(i); } } return null; @@ -142,8 +141,9 @@ public class Subserver { public void stop() { try { long pid = process.pid(); - if (checkpoint) + if (checkpoint) { pid = process.children().findAny().map(ProcessHandle::pid).orElse(pid); + } Runtime.getRuntime().exec(new String[]{"kill", "-SIGUSR1", Long.toString(pid)}); } catch (IOException e) { @@ -156,8 +156,7 @@ public class Subserver { process.destroyForcibly(); } - if (thread.isAlive()) - thread.join(); + if (thread.isAlive()) thread.join(); } catch (InterruptedException e) { logger.log(Level.SEVERE, "Subserver stop interrupted!", e); Thread.currentThread().interrupt(); @@ -186,8 +185,9 @@ public class Subserver { started = test.test(line); } - if (line == null) + if (line == null) { throw new IOException(serverName + " did not start correctly!"); + } } } @@ -225,18 +225,18 @@ public class Subserver { } else { sendProgress(0); start(process.getInputStream(), line -> { - if (line.contains("Loading libraries, please wait")) + if (line.contains("Loading libraries, please wait")) { sendProgress(2); - else if (line.contains("Starting Minecraft server on")) + } else if (line.contains("Starting Minecraft server on")) { sendProgress(5); - else if (line.contains("Preparing start region")) + } else if (line.contains("Preparing start region")) { sendProgress(8); + } return line.contains("Done ("); }); } - if (!started) - return; + if (!started) return; sendProgress(10); for (Player cachedPlayer : cachedPlayers) { @@ -253,8 +253,7 @@ public class Subserver { } finally { unregister(); shutdownCallback.run(); - if (ex != null) - failureCallback.accept(ex); + if (ex != null) failureCallback.accept(ex); } } diff --git a/VelocityCore/src/de/steamwar/command/SWCommand.java b/VelocityCore/src/de/steamwar/command/SWCommand.java index 7b8dad60..2fdf204f 100644 --- a/VelocityCore/src/de/steamwar/command/SWCommand.java +++ b/VelocityCore/src/de/steamwar/command/SWCommand.java @@ -84,8 +84,7 @@ public class SWCommand extends AbstractSWCommand { @Override public List suggest(Invocation invocation) { String[] args = invocation.arguments(); - if (args.length == 0) - args = new String[]{""}; + if (args.length == 0) args = new String[]{""}; return SWCommand.this.tabComplete(Chatter.of(invocation.source()), invocation.alias(), args); } @@ -99,8 +98,7 @@ public class SWCommand extends AbstractSWCommand { @Override public void unregister() { - if (command == null) - return; + if (command == null) return; VelocityCore.getProxy().getCommandManager().unregister(name); DiscordBot.getCommands().remove(name); @@ -108,8 +106,7 @@ public class SWCommand extends AbstractSWCommand { @Override public void register() { - if (command == null) - return; + if (command == null) return; VelocityCore.getProxy().getCommandManager().register(VelocityCore.getProxy().getCommandManager().metaBuilder(name).aliases(aliases).plugin(VelocityCore.get()).build(), command); DiscordBot.getCommands().put(name, this); diff --git a/VelocityCore/src/de/steamwar/messages/Chatter.java b/VelocityCore/src/de/steamwar/messages/Chatter.java index cf987b54..5cc74f23 100644 --- a/VelocityCore/src/de/steamwar/messages/Chatter.java +++ b/VelocityCore/src/de/steamwar/messages/Chatter.java @@ -86,10 +86,11 @@ public interface Chatter { default T withPlayerOrOffline(Function withPlayer, Supplier withOffline) { Player player = getPlayer(); - if (player == null) + if (player == null) { return withOffline.get(); - else + } else { return withPlayer.apply(player); + } } default void withPlayerOrOffline(Consumer withPlayer, Runnable withOffline) { @@ -128,10 +129,12 @@ public interface Chatter { default void send(boolean prefixed, Message onHover, ClickEvent onClick, Message message) { Component msg = parse(prefixed, message); - if (onHover != null) + if (onHover != null) { msg = msg.hoverEvent(HoverEvent.showText(parse(false, onHover))); - if (onClick != null) + } + if (onClick != null) { msg = msg.clickEvent(onClick); + } sendMessage(msg); } @@ -167,8 +170,9 @@ public interface Chatter { Locale locale = getLocale(); ResourceBundle resourceBundle = SteamwarResourceBundle.getResourceBundle(locale); String pattern = ""; - if (prefixed) + if (prefixed) { pattern = resourceBundle.getObject("PREFIX") + " "; + } pattern += (String) resourceBundle.getObject(message.format()); MessageFormat format = new MessageFormat(pattern, locale); @@ -200,8 +204,7 @@ public interface Chatter { } static Chatter of(CommandSource sender) { - if (sender instanceof Player player) - return of(player); + if (sender instanceof Player player) return of(player); //Console return new PlayerlessChatter() { @@ -232,8 +235,7 @@ public interface Chatter { static Chatter of(UUID uuid, boolean playerlessChatShown) { Player player = VelocityCore.getProxy().getPlayer(uuid).orElse(null); - if (player != null) - return Chatter.of(player); + if (player != null) return Chatter.of(player); return new PlayerlessChatter() { @Override diff --git a/VelocityCore/src/de/steamwar/messages/PlayerChatter.java b/VelocityCore/src/de/steamwar/messages/PlayerChatter.java index a79efa2a..cb46c69b 100644 --- a/VelocityCore/src/de/steamwar/messages/PlayerChatter.java +++ b/VelocityCore/src/de/steamwar/messages/PlayerChatter.java @@ -46,8 +46,7 @@ public class PlayerChatter implements Chatter { @Override public boolean chatShown() { - if (!player.hasSentPlayerSettings()) - return false; + if (!player.hasSentPlayerSettings()) return false; return player.getPlayerSettings().getChatMode() == PlayerSettings.ChatMode.SHOWN; } diff --git a/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java b/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java index b6ec5388..697c159c 100644 --- a/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java +++ b/VelocityCore/src/de/steamwar/messages/SteamwarResourceBundle.java @@ -36,8 +36,7 @@ public class SteamwarResourceBundle extends PropertyResourceBundle { private static synchronized ResourceBundle getResourceBundle(String locale, ResourceBundle parent) { return bundles.computeIfAbsent(locale, locale1 -> { InputStream inputStream = Message.class.getResourceAsStream(BASE_PATH + ("".equals(locale) ? "" : "_" + locale) + ".properties"); - if (inputStream == null) - return parent; + if (inputStream == null) return parent; try { return new SteamwarResourceBundle(inputStream, parent); } catch (IOException e) { diff --git a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java index a51919d0..a59a1d05 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ArenaMode.java @@ -50,8 +50,7 @@ public class ArenaMode { allModes.clear(); File folder = new File(VelocityCore.get().getDataDirectory().getParent().toFile(), "FightSystem"); - if (!folder.exists()) - return; + if (!folder.exists()) return; GameModeConfig.init(); SchematicType.init(); @@ -82,8 +81,9 @@ public class ArenaMode { public static List getAllChatNames(boolean historic) { List chatNames = new LinkedList<>(); for (GameModeConfig mode : byInternal.values()) { - if (mode.isActive() && historic == mode.Server.Historic) + if (mode.isActive() && historic == mode.Server.Historic) { chatNames.addAll(mode.Server.ChatNames); + } } return chatNames; } diff --git a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java index ca58ee78..62bc04de 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java +++ b/VelocityCore/src/de/steamwar/velocitycore/Broadcaster.java @@ -34,15 +34,16 @@ public class Broadcaster { private int lastBroadCast = 0; public Broadcaster() { - if (!broadcasts.isEmpty()) + if (!broadcasts.isEmpty()) { VelocityCore.schedule(this::broadcast).repeat(10, TimeUnit.MINUTES).schedule(); + } } private void broadcast() { - if (!VelocityCore.getProxy().getAllPlayers().isEmpty()) + if (!VelocityCore.getProxy().getAllPlayers().isEmpty()) { Chatter.broadcast().system("PLAIN_STRING", broadcasts.get(lastBroadCast++)); + } - if (lastBroadCast == broadcasts.size()) - lastBroadCast = 0; + if (lastBroadCast == broadcasts.size()) lastBroadCast = 0; } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java b/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java index 74b3ee20..bb389190 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ErrorLogger.java @@ -53,21 +53,20 @@ public class ErrorLogger extends AbstractAppender { @Override public void append(LogEvent event) { - if (event.getLevel().intLevel() > Level.WARN.intLevel()) - return; + if (event.getLevel().intLevel() > Level.WARN.intLevel()) return; String message = event.getMessage().getFormattedMessage(); - for (String reason : filteredMessages) - if (message.contains(reason)) - return; + for (String reason : filteredMessages) { + if (message.contains(reason)) return; + } ByteArrayOutputStream stacktraceOutput = new ByteArrayOutputStream(); if (event.getThrown() != null) event.getThrown().printStackTrace(new PrintStream(stacktraceOutput)); String stacktrace = stacktraceOutput.toString(); - for (String reason : filteredStacktraces) - if (stacktrace.contains(reason)) - return; + for (String reason : filteredStacktraces) { + if (stacktrace.contains(reason)) return; + } SWException.log(message, stacktrace); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java index 7308afeb..ce69ce32 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java +++ b/VelocityCore/src/de/steamwar/velocitycore/EventStarter.java @@ -97,11 +97,9 @@ public class EventStarter { private EventFight nextFight(Queue fights) { EventFight next = fights.peek(); - if (next == null) - return null; + if (next == null) return null; - if (!next.getStartTime().before(new Timestamp(System.currentTimeMillis()))) - return null; + if (!next.getStartTime().before(new Timestamp(System.currentTimeMillis()))) return null; return fights.poll(); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/Node.java b/VelocityCore/src/de/steamwar/velocitycore/Node.java index 77bc4742..c7f68c70 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/Node.java +++ b/VelocityCore/src/de/steamwar/velocitycore/Node.java @@ -54,8 +54,7 @@ public abstract class Node { public static Node getNode() { for (Node node : nodes) { - if (node.belowLoadLimit) - return node; + if (node.belowLoadLimit) return node; } return null; } @@ -99,10 +98,11 @@ public abstract class Node { } protected void constructServerstart(File directory, List cmd, String serverJar, String worldDir, String levelName, int port, String... dParams) { - if (JAVA_8.contains(serverJar)) + if (JAVA_8.contains(serverJar)) { cmd.add("/usr/lib/jvm/openj9-8/bin/java"); - else + } else { cmd.add("/usr/lib/jvm/openj9-21/bin/java"); + } for (String param : dParams) { cmd.add("-D" + param); @@ -203,14 +203,16 @@ public abstract class Node { protected void calcLoadLimit() { try { Process process = prepareExecution("cat /proc/meminfo").start(); - if (!process.waitFor(1, TimeUnit.SECONDS)) + if (!process.waitFor(1, TimeUnit.SECONDS)) { throw new IOException(hostname + " timeout"); + } try (BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) { calcLoadLimit(reader); } } catch (IOException e) { - if (belowLoadLimit) + if (belowLoadLimit) { VelocityCore.getLogger().log(Level.SEVERE, "Could read remote load", e); + } belowLoadLimit = false; } catch (InterruptedException e) { Thread.currentThread().interrupt(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java index e315809f..379feebc 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java +++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java @@ -166,10 +166,11 @@ public class ServerStarter { if (!world.exists()) { File storage = new File(version.getWorldFolder(WORLDS_STORAGE_BASE_PATH), worldName); - if (storage.exists()) + if (storage.exists()) { node.execute("mv", storage.getPath(), world.getPath()); - else + } else { copyWorld(node, new File(directory, "Bauwelt").getPath(), world.getPath()); + } } }; @@ -208,12 +209,10 @@ public class ServerStarter { // Stop existing build server startCondition = () -> { - if (startingBau(owner)) - return false; + if (startingBau(owner)) return false; Bauserver subserver = Bauserver.get(owner.getUniqueId()); - if (subserver != null && subserver.isStarted()) - subserver.stop(); + if (subserver != null && subserver.isStarted()) subserver.stop(); return !startingBau(owner); }; @@ -261,8 +260,9 @@ public class ServerStarter { public ServerStarter send(Player player) { playersToSend.add(player); - if (!(responsible instanceof Player)) + if (!(responsible instanceof Player)) { responsible = player; + } return this; } @@ -275,8 +275,7 @@ public class ServerStarter { public void start() { VelocityCore.schedule(() -> { synchronized (responsible) { - if (!startCondition.getAsBoolean()) - return; + if (!startCondition.getAsBoolean()) return; int port = portrange.freePort(); String serverName = serverNameProvider.apply(port); @@ -285,21 +284,24 @@ public class ServerStarter { if (node == null) { node = Node.getNode(); if (node == null) { - for (Player p : playersToSend) + for (Player p : playersToSend) { Chatter.of(p).system("SERVER_START_OVERLOAD"); + } return; } } - if (worldName == null) + if (worldName == null) { worldName = serverToWorldName(serverName); + } worldSetup.run(); arguments.put("logPath", worldName); File checkpointDir = new File("/tmp/" + System.getProperty("user.name") + ".checkpoints/" + directory.getName() + "/" + worldName); - if (checkpoint) + if (checkpoint) { arguments.put("checkpoint", checkpointDir.getPath()); + } ((VelocityViaConfig) Via.getConfig()).getVelocityServerProtocols().put(serverName, version.getProtocolVersion().getProtocol()); if (checkpoint && checkpointDir.exists()) { @@ -371,9 +373,7 @@ public class ServerStarter { private void increment() { current++; - - if (current == end) - current = start; + if (current == end) current = start; } private synchronized int freePort() { diff --git a/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java b/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java index 2d5d4e87..29542ba4 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java +++ b/VelocityCore/src/de/steamwar/velocitycore/SubserverSystem.java @@ -53,7 +53,8 @@ public class SubserverSystem { public static void sendPlayer(Subserver subserver, Player player) { subserver.sendPlayer(player); - if (!subserver.isStarted() && FightInfoHandler.onLobby(player)) + if (!subserver.isStarted() && FightInfoHandler.onLobby(player)) { NetworkSender.send(player, new StartingServerPacket(SteamwarUser.get(player.getUniqueId()).getId())); + } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java index ed93e80e..b658cb5c 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java +++ b/VelocityCore/src/de/steamwar/velocitycore/VelocityCore.java @@ -206,8 +206,9 @@ public class VelocityCore implements ReloadablePlugin { bot.getJda().getHttpClient().connectionPool().evictAll(); bot.getJda().getHttpClient().dispatcher().executorService().shutdown(); try { - if (!bot.getJda().awaitShutdown(1, TimeUnit.SECONDS)) + if (!bot.getJda().awaitShutdown(1, TimeUnit.SECONDS)) { logger.log(Level.SEVERE, "Could not await discord bot shutdown"); + } } catch (InterruptedException e) { Thread.currentThread().interrupt(); } @@ -233,8 +234,9 @@ public class VelocityCore implements ReloadablePlugin { List cmds = server.getCommands(); String cmd = cmds.remove(0); - if (server.getSpectatePort() != 0) + if (server.getSpectatePort() != 0) { EventStarter.addSpectateServer(server.getSpectatePort(), cmd); + } new ServerSwitchCommand(cmd, entry.getKey(), server.getSpectatePort() != 0, cmds.toArray(new String[0])); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java index 42dc6eb2..ea846789 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/AlertCommand.java @@ -42,7 +42,8 @@ public class AlertCommand extends SWCommand { String s = String.join(" ", message); Chatter.broadcast().system("ALERT", s.replace('&', '§')); - if ("-discord".equals(sendToDiscord)) + if ("-discord".equals(sendToDiscord)) { DiscordBot.withBot(bot -> bot.getAnnouncementChannel().send(s)); + } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java index 9a084286..f58d30a8 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BauCommand.java @@ -161,8 +161,9 @@ public class BauCommand extends SWCommand { setter.accept(target); Bauserver bauserver = Bauserver.get(owner.user().getUUID()); - if (bauserver != null) + if (bauserver != null) { bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaumemberUpdatePacket())); + } Chatter.of(user.getUUID()).system("BAU_MEMBER_SET_TARGET", owner, new Message(permName)); owner.system("BAU_MEMBER_SET", new Message(permName)); @@ -177,12 +178,14 @@ public class BauCommand extends SWCommand { Bauserver bauserver = Bauserver.get(owner.user().getUUID()); Chatter member = Chatter.of(user.getUUID()); member.withPlayer(player -> { - if (bauserver != null && bauserver.getRegisteredServer().getPlayersConnected().contains(player)) + if (bauserver != null && bauserver.getRegisteredServer().getPlayersConnected().contains(player)) { player.createConnectionRequest(VelocityCore.get().getConfig().lobbyserver()).fireAndForget(); + } }); - if (bauserver != null) + if (bauserver != null) { bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaumemberUpdatePacket())); + } member.system("BAU_DELMEMBER_DELETED_TARGET", owner); owner.system("BAU_DELMEMBER_DELETED"); @@ -211,8 +214,9 @@ public class BauCommand extends SWCommand { VelocityCore.schedule(() -> { sender.system("BAU_STOPPING"); Bauserver subserver = Bauserver.get(sender.user().getUUID()); - if (subserver != null) + if (subserver != null) { subserver.stop(); + } sender.system("BAU_STOPPED"); }).schedule(); @@ -227,8 +231,9 @@ public class BauCommand extends SWCommand { VelocityCore.schedule(() -> { Bauserver subserver = Bauserver.get(sender.user().getUUID()); - if (subserver != null) + if (subserver != null) { subserver.stop(); + } SubserverSystem.deleteFolder(VelocityCore.local, world); sender.system("BAU_DELETE_DELETED"); diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java index 0dbe6d91..3cecbcbb 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/BuilderCloudCommand.java @@ -114,8 +114,9 @@ public class BuilderCloudCommand extends SWCommand { File folder = getWorldFolder(previousArguments, 1); String[] files; - if (folder == null || (files = folder.list()) == null) + if (folder == null || (files = folder.list()) == null) { return Collections.emptyList(); + } return Arrays.stream(files).filter(file -> new File(folder, file).isDirectory()).filter(file -> s.startsWith(".") || !file.startsWith(".")).toList(); } @@ -129,17 +130,16 @@ public class BuilderCloudCommand extends SWCommand { return new TypeMapper() { @Override public File map(Chatter sender, PreviousArguments previousArguments, String s) { - if (s.isEmpty()) - return null; + if (s.isEmpty()) return null; File folder = getWorldFolder(previousArguments, 2); - if (folder == null) - throw new SecurityException(); + if (folder == null) throw new SecurityException(); File generator = new File(folder, s + ".dat"); - if (!generator.exists() || !generator.isFile()) + if (!generator.exists() || !generator.isFile()) { throw new SecurityException(); + } return generator; } @@ -149,8 +149,9 @@ public class BuilderCloudCommand extends SWCommand { File folder = getWorldFolder(previousArguments, 2); String[] files; - if (folder == null || (files = folder.list()) == null) + if (folder == null || (files = folder.list()) == null) { return Collections.emptyList(); + } return Arrays.stream(files).filter(file -> new File(folder, file).isFile()).filter(file -> file.endsWith(".dat")).map(file -> file.substring(0, file.length() - 4)).toList(); } @@ -163,8 +164,7 @@ public class BuilderCloudCommand extends SWCommand { private File getWorldFolder(PreviousArguments previousArguments, int offset) { ServerVersion v = ServerVersion.get(previousArguments.userArgs[previousArguments.userArgs.length - offset]); - if (v == null) - return null; + if (v == null) return null; return new File(v.getWorldFolder(ServerStarter.BUILDER_BASE_PATH)); } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java index 6da1e93f..2eeb46ae 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/CheckCommand.java @@ -77,8 +77,7 @@ public class CheckCommand extends SWCommand { public static void sendReminder(Chatter chatter) { List schematics = getSchemsToCheck(); - if (schematics.size() == currentCheckers.size()) - return; + if (schematics.size() == currentCheckers.size()) return; chatter.system("CHECK_REMINDER", new Message("CHECK_REMINDER_HOVER"), ClickEvent.runCommand("/check list"), schematics.size() - currentCheckers.size()); } @@ -167,8 +166,7 @@ public class CheckCommand extends SWCommand { } public static void abort(Player player) { - if (notChecking(player)) - return; + if (notChecking(player)) return; Chatter.of(player).system("CHECK_ABORT"); currentCheckers.get(player.getUniqueId()).abort(); @@ -176,8 +174,7 @@ public class CheckCommand extends SWCommand { @Register(value = "next", description = "CHECK_HELP_NEXT") public void next(PlayerChatter sender) { - if (notChecking(sender.getPlayer())) - return; + if (notChecking(sender.getPlayer())) return; currentCheckers.get(sender.getPlayer().getUniqueId()).next(); } @@ -189,16 +186,14 @@ public class CheckCommand extends SWCommand { @Register(value = "decline", description = "CHECK_HELP_DECLINE") public void decline(PlayerChatter sender) { - if (notChecking(sender.getPlayer())) - return; + if (notChecking(sender.getPlayer())) return; currentCheckers.get(sender.getPlayer().getUniqueId()).markDeclined(); } @Register(value = "decline", description = "CHECK_HELP_DECLINE") public void decline(PlayerChatter sender, String... message) { - if (notChecking(sender.getPlayer())) - return; + if (notChecking(sender.getPlayer())) return; currentCheckers.get(sender.getPlayer().getUniqueId()).decline(String.join(" ", message)); } @@ -207,8 +202,9 @@ public class CheckCommand extends SWCommand { List schematicList = new ArrayList<>(); for (SchematicType type : SchematicType.values()) { - if (type.check()) + if (type.check()) { schematicList.addAll(SchematicNode.getAllSchematicsOfType(type)); + } } return schematicList; } @@ -395,8 +391,7 @@ public class CheckCommand extends SWCommand { remove(); VelocityCore.schedule(() -> { Bauserver subserver = Bauserver.get(checker.user().getUUID()); - if (subserver != null) - subserver.stop(); + if (subserver != null) subserver.stop(); }).schedule(); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java index 304f30eb..d5084622 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/DevCommand.java @@ -77,8 +77,7 @@ public class DevCommand extends SWCommand { @Register(value = "reloadmodes") public void reloadModes(Chatter sender) { - if (!sender.user().hasPerm(UserPerm.ADMINISTRATION)) - return; + if (!sender.user().hasPerm(UserPerm.ADMINISTRATION)) return; try { ArenaMode.init(); @@ -148,8 +147,7 @@ public class DevCommand extends SWCommand { String name = "Dev " + user.getUserName(); ((VelocityViaConfig) Via.getConfig()).getVelocityServerProtocols().put(name, ServerVersion.get(devServerVersions.get(username)).getProtocolVersion().getProtocol()); - if (devServers.containsKey(username)) - return; + if (devServers.containsKey(username)) return; devServers.put(user.getUserName().toLowerCase(), VelocityCore.getProxy().registerServer(new ServerInfo(name, new InetSocketAddress("127.0.0.1", value)))); }); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java index b957b71c..27fb38bd 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventCommand.java @@ -55,8 +55,7 @@ public class EventCommand extends SWCommand { sender.system("EVENT_NO_CURRENT"); List coming = Event.getComing(); - if (coming.isEmpty()) - return; + if (coming.isEmpty()) return; sender.system("EVENT_COMING"); @@ -65,16 +64,19 @@ public class EventCommand extends SWCommand { for (Event e : coming) { sender.prefixless("EVENT_COMING_EVENT", e.getStart().toLocalDateTime().format(format), e.getEnd().toLocalDateTime().format(format), e.getEventName()); - if (now.isBefore(e.getDeadline().toInstant())) + if (now.isBefore(e.getDeadline().toInstant())) { sender.prefixless("EVENT_COMING_DEADLINE", e.getDeadline()); + } SchematicType schemType = e.getSchematicType(); - if (schemType != null && schemType.getDeadline() != null && now.isBefore(schemType.getDeadline().toInstant())) + if (schemType != null && schemType.getDeadline() != null && now.isBefore(schemType.getDeadline().toInstant())) { sender.prefixless("EVENT_COMING_SCHEM_DEADLINE", schemType.getDeadline()); + } Set teams = TeamTeilnahme.getTeams(e.getEventID()); - if (!teams.isEmpty()) + if (!teams.isEmpty()) { sender.prefixless("EVENT_COMING_TEAMS", teams.stream().map(team -> sender.parseToLegacy("EVENT_COMING_TEAM", team.getTeamColor(), team.getTeamKuerzel())).collect(Collectors.joining(" "))); + } } } @@ -150,8 +152,9 @@ public class EventCommand extends SWCommand { @ClassMapper(value = Team.class, local = true) public TypeMapper eventTeams() { return eventTeam(eventFight -> { - if (eventFight.getStartTime().after(new Timestamp(System.currentTimeMillis()))) + if (eventFight.getStartTime().after(new Timestamp(System.currentTimeMillis()))) { return Collections.emptyList(); + } return List.of(eventFight.getTeamBlue(), eventFight.getTeamRed()); }); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java index 29403f16..43ae2156 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/EventRescheduleCommand.java @@ -53,8 +53,7 @@ public class EventRescheduleCommand extends SWCommand { Timestamp now = Timestamp.from(new Date().toInstant()); while (it.hasPrevious()) { EventFight fight = it.previous(); - if (fight.getStartTime().after(now)) - continue; + if (fight.getStartTime().after(now)) continue; if (fight.getTeamBlue() == teamBlue.getTeamId() && fight.getTeamRed() == teamRed.getTeamId()) { sender.system("EVENTRESCHEDULE_STARTING"); diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java index 813ee182..ab03e0ec 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/FightCommand.java @@ -50,8 +50,7 @@ public class FightCommand extends SWCommand { private static void getModes(Chatter sender, String precommand, boolean historic) { Component start = Component.empty(); for (GameModeConfig mode : ArenaMode.getAllModes()) { - if (!mode.isActive() || mode.Server.Historic != historic) - continue; + if (!mode.isActive() || mode.Server.Historic != historic) continue; String command = precommand + mode.getChatName(); start = start.append(Component @@ -71,8 +70,9 @@ public class FightCommand extends SWCommand { return; } - if (map == null) + if (map == null) { map = arenaMode.getRandomMap(); + } if (!allowMerging) { callback.run(sender, arenaMode, map); diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java index 78fc7f16..70cb08b1 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/GDPRQuery.java @@ -208,8 +208,7 @@ public class GDPRQuery extends SWCommand { private void copyBauwelt(SteamwarUser user, ZipOutputStream out, String inDir, String outDir) throws IOException { File world = new File(inDir); - if (!world.exists()) - return; + if (!world.exists()) return; copy(new File(world, "level.dat"), out, outDir + "/level.dat"); @@ -226,8 +225,9 @@ public class GDPRQuery extends SWCommand { } File playerdata = new File(world, "playerdata/" + user.getUUID().toString() + ".dat"); - if (playerdata.exists()) + if (playerdata.exists()) { copy(playerdata, out, outDir + "/playerdata/" + user.getUUID().toString() + ".dat"); + } } private void copyPlayerdata(SteamwarUser user, ZipOutputStream out, String inDir, String outDir) throws IOException { @@ -237,8 +237,7 @@ public class GDPRQuery extends SWCommand { int i = 0; for (File world : worlds.listFiles()) { File playerdata = new File(world, path); - if (!playerdata.exists()) - continue; + if (!playerdata.exists()) continue; copy(playerdata, out, outDir + "/" + (i++) + "/" + user.getUUID().toString() + ".dat"); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java index 6f4fe490..d0dc6457 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ListCommand.java @@ -44,8 +44,7 @@ public class ListCommand extends SWCommand { SortedMap> playerMap = new TreeMap<>(); for (Player player : VelocityCore.getProxy().getAllPlayers()) { ServerConnection pserver = player.getCurrentServer().orElse(null); - if (pserver == null) - continue; + if (pserver == null) continue; if (Subserver.isBuild(Subserver.getSubserver(pserver.getServerInfo()))) { playerMap.computeIfAbsent("Bau", s -> new ArrayList<>()).add(player); diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java index 063599ed..c1822fff 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/PunishmentCommand.java @@ -115,8 +115,7 @@ public class PunishmentCommand { public PunishmentCommand(String command, Punishment.PunishmentType punishmentType) { new PunishCommand(command, punishmentType); - if (punishmentType.getUnpunishmentMessage() == null) - return; + if (punishmentType.getUnpunishmentMessage() == null) return; new UnpunishCommand("un" + command, punishmentType); } @@ -188,24 +187,20 @@ public class PunishmentCommand { private SteamwarUser unsafeUser(Chatter sender, String arg) { SteamwarUser target = getOrCreateOfflinePlayer(arg); - if (target == null) - sender.system("UNKNOWN_PLAYER"); + if (target == null) sender.system("UNKNOWN_PLAYER"); return target; } @Register public void genericCommand(Chatter sender, @Mapper("toPunish") String toPunish, String date, @ErrorMessage(allowEAs = false, value = "PUNISHMENT_USAGE_REASON") String... message) { SteamwarUser punisher = sender.user(); - if (!punisher.hasPerm(punishmentType.getUserPerm())) - return; + if (!punisher.hasPerm(punishmentType.getUserPerm())) return; SteamwarUser target = unsafeUser(sender, toPunish); - if (target == null) - return; + if (target == null) return; Timestamp banTime = parseTime(sender, date); - if (banTime == null) - return; + if (banTime == null) return; boolean isPerma = date.equalsIgnoreCase("perma"); String msg = String.join(" ", message); @@ -254,8 +249,7 @@ public class PunishmentCommand { @Register public void genericCommand(Chatter sender, @ErrorMessage("UNKNOWN_PLAYER") SteamwarUser target) { SteamwarUser punisher = sender.user(); - if (!punisher.hasPerm(punishmentType.getUserPerm())) - return; + if (!punisher.hasPerm(punishmentType.getUserPerm())) return; if (!target.isPunished(punishmentType)) { sender.system(punishmentType.getUsageNotPunished()); @@ -263,8 +257,9 @@ public class PunishmentCommand { } target.punish(punishmentType, Timestamp.from(new Date().toInstant()), command, sender.user().getId(), false); - if (punishmentType == Punishment.PunishmentType.Ban) + if (punishmentType == Punishment.PunishmentType.Ban) { BannedUserIPs.unbanIPs(target.getId()); + } sender.system(punishmentType.getUnpunishmentMessage(), target.getUserName()); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java index 23d358ad..26b55da0 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/ReplayCommand.java @@ -56,8 +56,7 @@ public class ReplayCommand extends SWCommand { @Register public void genericCommand(PlayerChatter sender, @OptionalValue("") String optionalMap) { - if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) - return; + if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) return; new SWStreamInv<>(sender, new Message("REPLAY_TITLE"), (click, fight) -> { startReplay(sender, click.isShiftClick(), optionalMap, fight); @@ -65,8 +64,7 @@ public class ReplayCommand extends SWCommand { } private void startReplay(PlayerChatter sender, boolean isAdmin, String optionalMap, Fight fight) { - if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) - return; + if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) return; GameModeConfig mode = ArenaMode.getBySchemType(fight.getSchemType()); ServerStarter starter = new ServerStarter().replay(fight.getFightID()).blueLeader(sender.getPlayer()); @@ -96,12 +94,14 @@ public class ReplayCommand extends SWCommand { lore.add(new Message("REPLAY_TIME", fight.getStartTime())); lore.add(new Message("SPACER")); lore.add(new Message("REPLAY_SERVER", fight.getServer(), Integer.toString(fight.getFightID()))); - if (!fight.replayAllowed()) + if (!fight.replayAllowed()) { lore.add(new Message("REPLAY_UNAVAILABLE")); + } item.setLore(lore); - if (fight.replayAllowed()) + if (fight.replayAllowed()) { item.setEnchanted(true); + } return item; } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java index 9ab038cf..5ced3ede 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/StatCommand.java @@ -43,8 +43,7 @@ public class StatCommand extends SWCommand { try { Process process = new ProcessBuilder("ps", "x").start(); new BufferedReader(new InputStreamReader(process.getInputStream())).lines().forEach(s -> { - if (!s.contains("--port")) - return; + if (!s.contains("--port")) return; serverCount.compute( s.contains("ssh -L") ? s.substring(s.indexOf("ssh -L") + 6).split(" ")[2] : "sw", (server, count) -> (count != null ? count : 0) + 1 diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java index 73476baf..7bf8c528 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TeamCommand.java @@ -65,8 +65,9 @@ public class TeamCommand extends SWCommand { } else { helpMessages(sender, "TEAM_HELP_CHAT", "TEAM_HELP_EVENT", "TEAM_HELP_LEAVE"); - if (user.isLeader()) + if (user.isLeader()) { helpMessages(sender, "TEAM_HELP_INVITE", "TEAM_HELP_REMOVE", "TEAM_HELP_KUERZEL", "TEAM_HELP_NAME", "TEAM_HELP_COLOR", "TEAM_HELP_LEADER", "TEAM_HELP_STEP_BACK", "TEAM_HELP_SERVER"); + } } } @@ -80,8 +81,9 @@ public class TeamCommand extends SWCommand { SteamwarUser user = sender.user(); Team team = Team.byId(user.getTeam()); - if (checkTeamKuerzel(sender, team, kuerzel) || checkTeamName(sender, team, name)) + if (checkTeamKuerzel(sender, team, kuerzel) || checkTeamName(sender, team, name)) { return; + } Team.create(kuerzel, name); user.setTeam(Team.get(kuerzel).getTeamId()); @@ -93,8 +95,7 @@ public class TeamCommand extends SWCommand { public void join(@Validator("isNotInTeam") Chatter sender, String... args) { SteamwarUser user = sender.user(); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; if (!teamInvitations.containsKey(user.getId())) { sender.system("TEAM_JOIN_NO_INVITE"); @@ -164,8 +165,7 @@ public class TeamCommand extends SWCommand { user.setTeam(0); - if (teamSize == 1) - team.disband(user); + if (teamSize == 1) team.disband(user); sender.system("TEAM_LEAVE_LEFT"); } @@ -179,8 +179,7 @@ public class TeamCommand extends SWCommand { public void invite(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_INVITE_NO_PLAYER") SteamwarUser target) { Team team = Team.byId(sender.user().getTeam()); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; if (target.getTeam() != 0) { sender.system("TEAM_INVITE_IN_TEAM"); @@ -246,11 +245,9 @@ public class TeamCommand extends SWCommand { public void changekuerzel(@Validator("isLeader") Chatter sender, @Length(min = 2, max = 4) @ErrorMessage("TEAM_KUERZEL_LENGTH") String kuerzel) { Team team = Team.byId(sender.user().getTeam()); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; - if (checkTeamKuerzel(sender, team, kuerzel)) - return; + if (checkTeamKuerzel(sender, team, kuerzel)) return; team.setTeamKuerzel(kuerzel); sender.system("TEAM_KUERZEL_CHANGED"); @@ -260,11 +257,9 @@ public class TeamCommand extends SWCommand { public void changename(@Validator("isLeader") Chatter sender, @Length(min = 4, max = 15) @ErrorMessage("TEAM_NAME_LENGTH") String name) { Team team = Team.byId(sender.user().getTeam()); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; - if (checkTeamName(sender, team, name)) - return; + if (checkTeamName(sender, team, name)) return; team.setTeamName(name); sender.system("TEAM_NAME_CHANGED"); @@ -272,8 +267,7 @@ public class TeamCommand extends SWCommand { @Register(value = "promote", description = "TEAM_LEADER_USAGE") public void promote(@Validator("isLeader") Chatter sender, @ErrorMessage("TEAM_LEADER_NOT_USER") @Mapper("memberList") SteamwarUser target) { - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; if (target.getTeam() != sender.user().getTeam()) { sender.system("TEAM_LEADER_NOT_MEMBER"); @@ -297,8 +291,9 @@ public class TeamCommand extends SWCommand { sender.prefixless("TEAM_INFO_LEADER", users.stream().filter(SteamwarUser::isLeader).count(), getMemberList(users, true)); String members = getMemberList(users, false); - if (!members.isEmpty()) + if (!members.isEmpty()) { sender.prefixless("TEAM_INFO_MEMBER", users.stream().filter(u -> !u.isLeader()).count(), members); + } Set events = TeamTeilnahme.getEvents(team.getTeamId()); if (!events.isEmpty()) { @@ -371,17 +366,19 @@ public class TeamCommand extends SWCommand { Component beforePage = Component .text("«« ") .color(page > 1 ? NamedTextColor.YELLOW : NamedTextColor.DARK_GRAY); - if (page > 1) + if (page > 1) { beforePage = beforePage .hoverEvent(HoverEvent.showText(sender.parse("TEAM_LIST_PREV"))) .clickEvent(ClickEvent.runCommand("/team list " + (page - 1))); + } Component nextPage = sender.parse("TEAM_LIST_PAGE") .color(page > 1 ? NamedTextColor.YELLOW : NamedTextColor.DARK_GRAY); - if (page < lastPage) + if (page < lastPage) { nextPage = nextPage .hoverEvent(HoverEvent.showText(sender.parse("TEAM_LIST_NEXT"))) .clickEvent(ClickEvent.runCommand("/team list " + (page + 1))); + } sender.sendMessage(beforePage.append(nextPage)); } @@ -404,8 +401,7 @@ public class TeamCommand extends SWCommand { public void event(@Validator("isLeader") Chatter sender, Event event) { Team team = Team.byId(sender.user().getTeam()); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; if (Instant.now().isAfter(event.getDeadline().toInstant())) { sender.system("TEAM_EVENT_OVER"); @@ -450,8 +446,7 @@ public class TeamCommand extends SWCommand { public void changeColor(@Validator("isLeader") PlayerChatter sender) { Team team = Team.byId(sender.user().getTeam()); - if (notDuringEvent(sender)) - return; + if (notDuringEvent(sender)) return; SWListInv inv = new SWListInv<>(sender, new Message("TEAM_COLOR_TITLE"), COLOR_CODES.entrySet().stream().map(entry -> new SWListInv.SWListEntry<>(new SWItem(entry.getValue(), new Message("PLAIN_STRING", "§" + entry.getKey() + team.getTeamKuerzel())), entry.getKey())).toList(), (click, element) -> { }); diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java index e4d25569..39d269f1 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/TpCommand.java @@ -115,8 +115,9 @@ public class TpCommand extends SWCommand { } if (Subserver.isArena(subserver)) { - if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) + if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) { return; + } } else if (Subserver.isBuild(subserver)) { Bauserver bauserver = (Bauserver) subserver; Player checker = VelocityCore.getProxy().getPlayer(bauserver.getOwner()).orElse(null); @@ -149,16 +150,18 @@ public class TpCommand extends SWCommand { //Get target player server Player target = VelocityCore.getProxy().getPlayer(arg).orElse(null); - if (target != null) + if (target != null) { server = target.getCurrentServer().map(ServerConnection::getServer).orElse(server); + } //Get target team event arena if (server == null) { Team team = Team.get(arg); if (team != null) { Subserver eventArena = EventStarter.getEventServer().get(team.getTeamId()); - if (eventArena != null && Subserver.getServerList().contains(eventArena)) + if (eventArena != null && Subserver.getServerList().contains(eventArena)) { server = eventArena.getRegisteredServer(); + } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java index bafc34a6..2c7d5a62 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java +++ b/VelocityCore/src/de/steamwar/velocitycore/commands/WhoisCommand.java @@ -69,15 +69,15 @@ public class WhoisCommand extends SWCommand { sender.system("WHOIS_PREFIX", user.prefix().getColorCode() + user.prefix().getChatPrefix()); sender.system("WHOIS_TEAM", new Message("WHOIS_TEAM_HOVER", team.getTeamName()), ClickEvent.runCommand("/team info " + team.getTeamName()), team.getTeamColor(), team.getTeamKuerzel(), team.getTeamName()); - if (!sender.user().hasPerm(UserPerm.TEAM)) - return; + if (!sender.user().hasPerm(UserPerm.TEAM)) return; sender.system("WHOIS_STREAMING", !StreamingCommand.isNotStreaming(user)); if (sender.user().hasPerm(UserPerm.MODERATION) || sender.user().hasPerm(UserPerm.PREFIX_DEVELOPER)) { sender.system("WHOIS_ID", user.getId()); sender.system("WHOIS_UUID", new Message("WHOIS_UUID_HOVER"), ClickEvent.copyToClipboard(user.getUUID().toString()), user.getUUID().toString()); - if (user.getDiscordId() != null) + if (user.getDiscordId() != null) { sender.system("WHOIS_DISCORD_ID", user.getDiscordId()); + } sender.system("WHOIS_PERMS", user.perms().stream().map(Enum::name).collect(Collectors.joining(", "))); } @@ -90,10 +90,12 @@ public class WhoisCommand extends SWCommand { } Timestamp lastOnline = user.getLastOnline(); - if (firstJoin != null) + if (firstJoin != null) { sender.system("WHOIS_JOINED_FIRST", firstJoin.toString()); - if (lastOnline != null) + } + if (lastOnline != null) { sender.system("WHOIS_LAST_ONLINE", lastOnline.toString()); + } sender.system("WHOIS_HOURS_PLAYED", new DecimalFormat("###.##").format(onlineTime / 3600d)); if (target != null) { @@ -102,8 +104,9 @@ public class WhoisCommand extends SWCommand { sender.system("WHOIS_CURRENT_PROTOCOL", target.getProtocolVersion().getMostRecentSupportedVersion()); List mods = ModUtils.getPlayerModMap().get(user.getUUID()); - if (mods == null) + if (mods == null) { mods = Collections.emptyList(); + } sender.system("WHOIS_PLATFORM", mods.isEmpty() ? "Vanilla" : mods.get(0).getPlatform().toString()); @@ -137,10 +140,11 @@ public class WhoisCommand extends SWCommand { } private Message duration(Chatter sender, Timestamp timestamp, boolean perma) { - if (perma) + if (perma) { return new Message("PUNISHMENT_PERMA"); - else + } else { return new Message("PLAIN_STRING", timestamp.toLocalDateTime().format(DateTimeFormatter.ofPattern(sender.parseToPlain("TIMEFORMAT")))); + } } @ClassMapper(value = WhoisParameterTypes.class, local = true) diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java index 40dee4b1..cdcb8e51 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordBot.java @@ -70,8 +70,7 @@ public class DiscordBot { private final OptionData commandArgument = new OptionData(OptionType.STRING, ARGUMENT_NAME, "Command arguments", false); public static void withBot(Consumer consumer) { - if (instance != null) - consumer.accept(instance); + if (instance != null) consumer.accept(instance); } public static Guild getGuild() { @@ -143,8 +142,9 @@ public class DiscordBot { ActionRow.of(Button.link("https://steamwar.de", "Website"), Button.link("https://steamwar.de/youtube", "YouTube")), ActionRow.of(Button.primary("auth", Emoji.fromUnicode("U+2705")).withLabel("Minecraft verknüpfen")) ), event -> { - if (event.getComponentId().equals("auth")) + if (event.getComponentId().equals("auth")) { event.reply("Gebe innerhalb der nächsten 10 Minuten ``/verify " + AuthManager.createDiscordAuthToken(event.getUser()) + "`` auf dem Minecraft Server ein").setEphemeral(true).queue(); + } }); List actionRows = new ArrayList<>(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java index 59b541c7..3f0f0fd0 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/DiscordConfig.java @@ -36,8 +36,7 @@ public class DiscordConfig { public static DiscordConfig load() { File file = new File(System.getProperty("user.home"), "discord.yml"); - if (!file.exists() || VelocityCore.get().getConfig().isEventmode()) - return null; + if (!file.exists() || VelocityCore.get().getConfig().isEventmode()) return null; return Config.load(DiscordConfig.class, file, description -> description.addPropertyParameters("roles", String.class, DiscordRole.class)); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java index d74e3fa1..0a5af164 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/EventChannel.java @@ -42,8 +42,7 @@ import java.util.stream.Collectors; public class EventChannel { public MessageCreateBuilder get() { - if (Event.get() == null) - return updateComing(); + if (Event.get() == null) return updateComing(); return updateCurrent(); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java index 8648d66d..3bec109f 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/channels/InteractionReply.java @@ -53,10 +53,11 @@ public class InteractionReply extends DiscordChannel { return; } - if (interaction.getHook().isExpired()) + if (interaction.getHook().isExpired()) { super.sendMessage(msg); - else + } else { interaction.getHook().sendMessage(PlainTextComponentSerializer.plainText().serialize(msg)).queue(); + } } public void submit() { diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java index 49babfd0..d1108b8c 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/ChannelListener.java @@ -46,18 +46,15 @@ public class ChannelListener extends ListenerAdapter { @Override public void onMessageReceived(@NotNull MessageReceivedEvent event) { - if (event.getAuthor().isBot()) - return; + if (event.getAuthor().isBot()) return; DiscordChannel channel = channels.get(event.getChannel()); - if (channel != null) - channel.received(event); + if (channel != null) channel.received(event); } @Override public void onGenericComponentInteractionCreate(@NotNull GenericComponentInteractionCreateEvent event) { - if (event.getType() != InteractionType.COMPONENT) - return; + if (event.getType() != InteractionType.COMPONENT) return; DiscordChannel channel = channels.get(event.getChannel()); if (channel != null) { @@ -65,27 +62,27 @@ public class ChannelListener extends ListenerAdapter { return; } - if (event.getChannelType() == ChannelType.PRIVATE && event.getComponentId().equals("tada")) + if (event.getChannelType() == ChannelType.PRIVATE && event.getComponentId().equals("tada")) { event.reply(":tada:").queue(); + } } @Override public void onSlashCommandInteraction(@NotNull SlashCommandInteractionEvent event) { if (event.getGuild().getIdLong() == 1241489896909180998L) return; InteractionReply.reply(event, sender -> { - if (sender.user().getDiscordId() == null) - return; + if (sender.user().getDiscordId() == null) return; OptionMapping option = event.getOption(DiscordBot.ARGUMENT_NAME); String args = ""; - if (option != null) + if (option != null) { args = option.getAsString(); + } VelocityCore.getLogger().log(Level.INFO, "%s -> executed Discord command /%s %s".formatted(sender.user().getUserName(), event.getName(), args)); SWCommand command = DiscordBot.getCommands().get(event.getName()); UserPerm permission = command.getPermission(); - if (permission != null && !sender.user().perms().contains(permission)) - return; + if (permission != null && !sender.user().perms().contains(permission)) return; command.execute(sender, args.isEmpty() ? new String[0] : args.split(" ")); }); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java index 474d2edb..7b4c9958 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordSchemUpload.java @@ -52,8 +52,7 @@ public class DiscordSchemUpload extends ListenerAdapter { if (event.isFromGuild()) return; Message message = event.getMessage(); - if (message.getAttachments().isEmpty()) - return; + if (message.getAttachments().isEmpty()) return; DiscordChannel sender = new DiscordChannel(event.getAuthor()); SteamwarUser user = sender.user(); @@ -82,8 +81,9 @@ public class DiscordSchemUpload extends ListenerAdapter { } SchematicNode node = SchematicNode.getSchematicNode(user.getId(), name, (Integer) null); - if (node == null) + if (node == null) { node = SchematicNode.createSchematic(user.getId(), name, null); + } try (InputStream in = attachment.getProxy().download().get()) { byte[] bytes = in.readAllBytes(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java index 921e43f6..52517d59 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTeamEvent.java @@ -33,8 +33,7 @@ public class DiscordTeamEvent extends ListenerAdapter { @Override public void onStringSelectInteraction(@NotNull StringSelectInteractionEvent event) { - if (!event.getChannel().getId().equals(eventsChannel)) - return; + if (!event.getChannel().getId().equals(eventsChannel)) return; if (event.getSelectedOptions().isEmpty()) { event.deferReply(true).queue(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java index 5ebae03c..f73897e0 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/listeners/DiscordTicketHandler.java @@ -151,14 +151,14 @@ public class DiscordTicketHandler extends ListenerAdapter { !channel.getId().equals(TICKET_CHANNEL) && !channel.getId().equals(TICKET_LOG) ) { - if (event.getAuthor().isBot()) - return; + if (event.getAuthor().isBot()) return; ChatterGroup receivers = new ChatterGroup(Chatter.allStream().filter(player -> player.user().hasPerm(UserPerm.TICKET_LOG))); try { SteamwarUser user = SteamwarUser.get(Long.parseLong(textChannel.getTopic())); - if (user != null && !user.perms().contains(UserPerm.TEAM)) + if (user != null && !user.perms().contains(UserPerm.TEAM)) { receivers = new ChatterGroup(receivers, Chatter.of(user)); + } } catch (NumberFormatException e) { //ignored } diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java index 56c5aff2..87b259bd 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/AuthManager.java @@ -57,8 +57,7 @@ public class AuthManager { public User connectAuth(SteamwarUser user, String code) { User dcUser = TOKENS.remove(code); - if (dcUser == null) - return null; + if (dcUser == null) return null; user.setDiscordId(dcUser.getIdLong()); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java index d228aa1b..9a92e285 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordAlert.java @@ -40,12 +40,10 @@ public class DiscordAlert { public static void send(Chatter player, Color color, Message title, Message description, boolean success) { DiscordBot.withBot(bot -> { Long discordId = player.user().getDiscordId(); - if (discordId == null) - return; + if (discordId == null) return; User user = DiscordBot.getInstance().getJda().retrieveUserById(discordId).complete(); - if (user == null) - return; + if (user == null) return; MessageCreateBuilder builder = new MessageCreateBuilder() .setEmbeds(new EmbedBuilder() @@ -55,8 +53,9 @@ public class DiscordAlert { .setDescription(player.parseToPlain(description)) .setTimestamp(Instant.now()) .build()); - if (success) + if (success) { builder.setComponents(ActionRow.of(Button.success("tada", Emoji.fromUnicode("U+1F389")))); + } new DiscordChannel(user).send(builder); }); diff --git a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java index 20af596c..b05cdc30 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java +++ b/VelocityCore/src/de/steamwar/velocitycore/discord/util/DiscordRanks.java @@ -38,8 +38,7 @@ public class DiscordRanks { private final Map prefixToPermName = UserPerm.prefixes.entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, entry -> entry.getKey().name().toLowerCase())); public void update(SteamwarUser user) { - if (user.getDiscordId() == null) - return; + if (user.getDiscordId() == null) return; Set swRoles = new HashSet<>(DiscordBot.getInstance().getConfig().getRanks().values()); @@ -51,11 +50,13 @@ public class DiscordRanks { .filter(role -> !role.getId().equals(prefixRole)) .forEach(role -> guild.removeRoleFromMember(member, role).queue()); - if (prefixRole != null && member.getRoles().stream().noneMatch(role -> role.getId().equals(prefixRole))) + if (prefixRole != null && member.getRoles().stream().noneMatch(role -> role.getId().equals(prefixRole))) { guild.addRoleToMember(member, guild.getRoleById(prefixRole)).queue(); + } }, e -> { - if (e instanceof ErrorResponseException err && err.getErrorCode() == 10007) + if (e instanceof ErrorResponseException err && err.getErrorCode() == 10007) { user.setDiscordId(null); + } }); } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java index c7d2dece..4c06aa0d 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java +++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWInventory.java @@ -78,8 +78,7 @@ public class SWInventory { public void handleClose() { if (processingClick.compareAndSet(false, true)) { InventoryCallbackHandler.inventoryHashMap.remove(player.user().getId(), this); - if (close != null) - close.clicked(null); + if (close != null) close.clicked(null); processingClick.set(false); } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java index f4affc1c..425314a9 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java +++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWItem.java @@ -41,7 +41,6 @@ public class SWItem { private List lore = new ArrayList<>(); @Getter private InvCallback callback; - private int color = 0; private int customModelData = 0; public SWItem(String material, Message title) { @@ -70,14 +69,15 @@ public class SWItem { object.addProperty("material", material); object.addProperty("position", position); object.addProperty("title", player.parseToLegacy(title)); - if (skullOwner != null) + if (skullOwner != null) { object.addProperty("skullOwner", skullOwner); - if (enchanted) + } + if (enchanted) { object.addProperty("enchanted", true); - if (hideAttributes) + } + if (hideAttributes) { object.addProperty("hideAttributes", true); - if (color != 0) - object.addProperty("color", color); + } if (lore != null) { JsonArray array = new JsonArray(); for (Message lores : lore) { diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java index 1624793b..6eae398e 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java +++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWListInv.java @@ -43,22 +43,24 @@ public class SWListInv extends SWInventory { @Override public void open() { if (elements.size() > 54) { - if (page != 0) + if (page != 0) { addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> { page--; open(); }); - else + } else { addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> { }); - if (page < elements.size() / 45) + } + if (page < elements.size() / 45) { addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> { page++; open(); }); - else + } else { addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> { }); + } } int ipageLimit = elements.size() - page * 45; diff --git a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java index 60de7635..88f52eae 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java +++ b/VelocityCore/src/de/steamwar/velocitycore/inventory/SWStreamInv.java @@ -41,23 +41,25 @@ public class SWStreamInv extends SWInventory { public void open() { List> entries = constructor.apply(page); - if (page != 0) + if (page != 0) { addItem(45, new SWItem("LIME_DYE", new Message("INV_PAGE_BACK", "e")), (InvCallback.ClickType click) -> { page--; open(); }); - else + } else { addItem(45, new SWItem("GRAY_DYE", new Message("INV_PAGE_BACK", "7")), (InvCallback.ClickType click) -> { }); + } - if (entries.size() == 45) + if (entries.size() == 45) { addItem(53, new SWItem("LIME_DYE", new Message("INV_PAGE_NEXT", "e")), (InvCallback.ClickType click) -> { page++; open(); }); - else + } else { addItem(53, new SWItem("GRAY_DYE", new Message("INV_PAGE_NEXT", "7")), (InvCallback.ClickType click) -> { }); + } for (int i = 0; i < entries.size(); i++) { SWListInv.SWListEntry item = entries.get(i); diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java index ff44cc41..aff63f2a 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/BanListener.java @@ -65,8 +65,9 @@ public class BanListener extends BasicListener { perma = true; break; } - if (ban.getEndTime().after(highestBan)) + if (ban.getEndTime().after(highestBan)) { highestBan = ban.getEndTime(); + } } } ClickEvent clickEvent = ClickEvent.runCommand("/ban " + user.getUserName() + " " diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java index a74c03d9..2e083b4d 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ChatListener.java @@ -67,10 +67,11 @@ public class ChatListener extends BasicListener { command = "/" + command.substring(1); CommandExecuteEvent.CommandResult result = e.getResult(); - if (result.isForwardToServer()) + if (result.isForwardToServer()) { result = CommandExecuteEvent.CommandResult.forwardToServer(command); - else if (result.isAllowed()) + } else if (result.isAllowed()) { result = CommandExecuteEvent.CommandResult.command(command); + } e.setResult(result); } @@ -132,8 +133,9 @@ public class ChatListener extends BasicListener { return; } - if (isMistypedCommand(player, message)) + if (isMistypedCommand(player, message)) { return; + } Subserver subserver = Subserver.getSubserver(player); String serverName = AuditLog.SERVER_NAME_VELOCITY; @@ -156,12 +158,12 @@ public class ChatListener extends BasicListener { String command = message.substring(1); boolean isCommand = message.startsWith("7") && command.matches("^[7/]?[A-Za-z]+"); if (isCommand && Boolean.FALSE.equals(VelocityCore.getProxy().getCommandManager().executeAsync(player, command).join())) { - if (command.startsWith("7")) + if (command.startsWith("7")) { command = "/" + command.substring(1); + } message = "/" + command; - if (filteredCommand(Chatter.of(player), message)) - return true; + if (filteredCommand(Chatter.of(player), message)) return true; player.spoofChatInput(message); } @@ -172,15 +174,13 @@ public class ChatListener extends BasicListener { public static void sendChat(Chatter sender, ChatterGroup receivers, String format, Chatter msgReceiver, String message) { SteamwarUser user = sender.user(); final String coloredMessage = user.hasPerm(UserPerm.COLOR_CHAT) ? message.replace('&', '§') : message; - if (chatFilter(sender, coloredMessage)) - return; + if (chatFilter(sender, coloredMessage)) return; boolean noReceiver = true; for (Chatter player : receivers.getChatters()) { if (player.chatShown()) { chatToReciever(player, msgReceiver, user, format, coloredMessage); - if (sender.user().getId() != player.user().getId()) - noReceiver = false; + if (sender.user().getId() != player.user().getId()) noReceiver = false; } } @@ -200,11 +200,9 @@ public class ChatListener extends BasicListener { return; } - if (ChatListener.filteredCommand(sender, message)) - return; + if (ChatListener.filteredCommand(sender, message)) return; - if (!message.startsWith("/") && chatFilter(sender, message)) - return; + if (!message.startsWith("/") && chatFilter(sender, message)) return; sender.getPlayer().spoofChatInput(message); } @@ -226,15 +224,17 @@ public class ChatListener extends BasicListener { return true; } - if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.Mute)) - return true; + if (PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.Mute)) return true; - if (message.contains("LIXFEL")) + if (message.contains("LIXFEL")) { specialAlert(sender, "Lixfel", "CHAT_LIXFEL_", 3, 6, 11, 12, 15); - if (message.contains("YOYONOW")) + } + if (message.contains("YOYONOW")) { specialAlert(sender, "YoyoNow", "CHAT_YOYONOW_", 3, 6, 11, 12); - if (message.contains("CHAOSCAOT")) + } + if (message.contains("CHAOSCAOT")) { specialAlert(sender, "Chaoscaot", "CHAT_CHAOSCAOT_", 3, 6, 11, 12, 15, 17); + } return false; } @@ -271,8 +271,7 @@ public class ChatListener extends BasicListener { } private static String highlightMentions(String message, String returnColor, Chatter player) { - if (!message.contains("@")) - return message; + if (!message.contains("@")) return message; String mark = "@" + player.user().getUserName(); return Arrays.stream(message.split(" ")).map(cur -> { @@ -290,10 +289,11 @@ public class ChatListener extends BasicListener { int i = 0; while (i < suggestions.size()) { String suggestion = suggestions.get(i); - if (suggestion.startsWith("/") && suggestion.contains(":")) + if (suggestion.startsWith("/") && suggestion.contains(":")) { suggestions.remove(i); - else + } else { i++; + } } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java index 9e7b1510..2211f59f 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CheckListener.java @@ -44,12 +44,14 @@ public class CheckListener extends BasicListener { List uncheckedSchematics = new ArrayList<>(); for (SchematicType type : SchematicType.values()) { - if (type.check()) + if (type.check()) { uncheckedSchematics.addAll(SchematicNode.getAllSchematicsOfType(sender.user().getId(), type.toDB())); + } } - if (!uncheckedSchematics.isEmpty()) + if (!uncheckedSchematics.isEmpty()) { sender.system("CHECK_UNCHECKED", uncheckedSchematics.size()); + } } @Subscribe @@ -57,15 +59,17 @@ public class CheckListener extends BasicListener { Player player = e.getPlayer(); if (CheckCommand.isChecking(player)) { Subserver server = Subserver.getSubserver(e.getServer().getServerInfo()); - if (!Subserver.isBuild(server) || ((Bauserver) server).getOwner() != player.getUniqueId()) + if (!Subserver.isBuild(server) || ((Bauserver) server).getOwner() != player.getUniqueId()) { CheckCommand.abort(player); + } } } @Subscribe public void onPlayerDisconnect(DisconnectEvent e) { Player player = e.getPlayer(); - if (CheckCommand.isChecking(player)) + if (CheckCommand.isChecking(player)) { CheckCommand.abort(player); + } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java index 4377a5b0..b8bffa6e 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/ConnectionListener.java @@ -60,16 +60,18 @@ public class ConnectionListener extends BasicListener { @Subscribe public void onPermissionSetup(PermissionsSetupEvent event) { event.setProvider(subject -> { - if (!(subject instanceof Player player)) + if (!(subject instanceof Player player)) { return perm -> Tristate.TRUE; + } Set perms = SteamwarUser.getOrCreate(player.getUniqueId(), player.getUsername(), ConnectionListener::newPlayer).perms(); - if (perms.contains(UserPerm.ADMINISTRATION)) + if (perms.contains(UserPerm.ADMINISTRATION)) { return perm -> Tristate.TRUE; - else if (perms.contains(UserPerm.TEAM)) + } else if (perms.contains(UserPerm.TEAM)) { return perm -> Tristate.fromBoolean(TEAM_PERMISSIONS.contains(perm)); - else + } else { return perm -> Tristate.FALSE; + } }); } @@ -79,8 +81,7 @@ public class ConnectionListener extends BasicListener { SteamwarUser user = SteamwarUser.get(player.getUniqueId()); Chatter chatter = Chatter.of(player); - if (user.hasPerm(UserPerm.CHECK)) - CheckCommand.sendReminder(chatter); + if (user.hasPerm(UserPerm.CHECK)) CheckCommand.sendReminder(chatter); for (Subserver subserver : Subserver.getServerList()) { if (Subserver.isArena(subserver)) { diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java index f34fe1c5..7acec792 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/CookieEvents.java @@ -36,10 +36,8 @@ public class CookieEvents extends BasicListener { @Subscribe public void handleCookies(CookieReceiveEvent e) { System.out.println(e.getOriginalKey() + " " + e.getOriginalData()); - if (!e.getOriginalKey().namespace().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.namespace())) - return; - if (!e.getOriginalKey().value().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.value())) - return; + if (!e.getOriginalKey().namespace().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.namespace())) return; + if (!e.getOriginalKey().value().equals(EventModeListener.EVENT_TO_SPECTATE_KEY.value())) return; e.setResult(CookieReceiveEvent.ForwardResult.handled()); Player player = e.getPlayer(); SteamwarUser user = SteamwarUser.get(player.getUniqueId()); diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java index 3ddbd94e..60b05cf3 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/EventModeListener.java @@ -74,8 +74,7 @@ public class EventModeListener extends BasicListener { return; } - if (Referee.get(event.getEventID()).contains(user.getId())) - return; + if (Referee.get(event.getEventID()).contains(user.getId())) return; if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20_5)) { sender.system("EVENTMODE_KICK"); @@ -94,8 +93,7 @@ public class EventModeListener extends BasicListener { SteamwarUser user = SteamwarUser.get(player.getUniqueId()); Event event = Event.get(); - if (event != null && Referee.get(event.getEventID()).contains(user.getId())) - return; + if (event != null && Referee.get(event.getEventID()).contains(user.getId())) return; List activeFights = EventFight.getActiveFights(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java index 3fe65469..533c86e5 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/PluginMessage.java @@ -520,8 +520,9 @@ public class PluginMessage extends BasicListener { String brand = event.getBrand(); VelocityCore.getLogger().log(knownBrands.contains(brand) ? Level.INFO : Level.WARNING, () -> player.getUsername() + " joins with brand: " + brand); - if (brand.equals("badlion")) + if (brand.equals("badlion")) { badlion.sendRestrictions(player); + } } private void registerPassthroughToClient(String... channels) { @@ -547,8 +548,9 @@ public class PluginMessage extends BasicListener { private void register(String channel, boolean clientSideRegister, Parser handler) { handlers.put(channel, handler); - if (clientSideRegister) + if (clientSideRegister) { VelocityCore.getProxy().getChannelRegistrar().register(channel.indexOf(':') != -1 ? MinecraftChannelIdentifier.from(channel) : new LegacyChannelIdentifier(channel)); + } } private void serverRegistersChannel(PluginMessageEvent event) { @@ -568,10 +570,11 @@ public class PluginMessage extends BasicListener { private Parser directional(Parser fromServer, Parser fromPlayer) { return event -> { - if (event.getSource() instanceof Player) + if (event.getSource() instanceof Player) { fromPlayer.handle(event); - else + } else { fromServer.handle(event); + } }; } diff --git a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java index 8d149bb1..2a3448c0 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java +++ b/VelocityCore/src/de/steamwar/velocitycore/listeners/VersionAnnouncer.java @@ -56,11 +56,9 @@ public class VersionAnnouncer extends BasicListener { }).delay(Duration.of(100, ChronoUnit.MILLIS)).schedule(); } - if (playerVersion == serverVersion) - return; + if (playerVersion == serverVersion) return; - if (!Subserver.isBuild(Subserver.getSubserver(server))) - return; + if (!Subserver.isBuild(Subserver.getSubserver(server))) return; player.sendActionBar(Chatter.of(player).parse("SERVER_VERSION", ProtocolVersion.getProtocolVersion(serverVersion).getMostRecentSupportedVersion())); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java index c0131938..410db6dd 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FML.java @@ -60,8 +60,9 @@ public class FML extends BasicListener { } //if(isFML(player, "\0FML\0")) - if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_13)) + if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_13)) { player.sendPluginMessage(new LegacyChannelIdentifier(CHANNEL), helloPacket); + } } public void handlePluginMessage(PluginMessageEvent event) { diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java index 6fab9e61..db33905b 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FML2.java @@ -78,8 +78,7 @@ public class FML2 extends BasicListener { boolean fml2 = isFML(connection, "\0FML2\0"); boolean fml3 = isFML(connection, "\0FML3\0"); boolean forge = isFML(connection, "\0FORGE"); - if (!fml2 && !fml3 && !forge) - return; + if (!fml2 && !fml3 && !forge) return; FML2LoginHandler handler = new FML2LoginHandler(connection, event.getUniqueId(), forge); @@ -107,8 +106,9 @@ public class FML2 extends BasicListener { } ProtocolUtils.writeVarInt(packet, 0); // Registries amount - if (fml3) + if (fml3) { ProtocolUtils.writeVarInt(packet, 0); // DataPacks amount + } ProtocolUtils.writeVarInt(buf, packet.readableBytes()); buf.writeBytes(packet); diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java index bd97ccc7..cf32fc53 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/FabricModSender.java @@ -105,8 +105,7 @@ public class FabricModSender extends BasicListener { return; } - if (!ModUtils.handleMods(player, mods)) - return; + if (!ModUtils.handleMods(player, mods)) return; if (!Storage.fabricCheckedPlayers.containsKey(player)) { Storage.fabricCheckedPlayers.put(player, data.hashCode()); diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java index f83a7ce3..d168e901 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/Hostname.java @@ -47,8 +47,7 @@ public class Hostname extends BasicListener { public static String getExtraHandshakeData(LoginInboundConnection loginInboundConnection) { HandshakePacket handshakePacket = handshake.get(getInitialInboundConnection(loginInboundConnection)); int i = handshakePacket.getServerAddress().indexOf('\0'); - if (i == -1) - return ""; + if (i == -1) return ""; return handshakePacket.getServerAddress().substring(i); } @@ -79,11 +78,13 @@ public class Hostname extends BasicListener { @Subscribe public void onHandshake(ConnectionHandshakeEvent event) { String hostname = event.getConnection().getVirtualHost().orElseThrow().getHostName().toLowerCase(); - if (!knownHostnames.contains(hostname) && !hostname.endsWith(".steamwar.de")) + if (!knownHostnames.contains(hostname) && !hostname.endsWith(".steamwar.de")) { VelocityCore.getLogger().log(Level.WARNING, () -> event.getConnection().getRemoteAddress() + " connected with unknown hostname " + hostname); + } String extraData = getExtraHandshakeData((LoginInboundConnection) event.getConnection()); - if (!knownExtraData.contains(extraData)) + if (!knownExtraData.contains(extraData)) { VelocityCore.getLogger().log(Level.WARNING, () -> event.getConnection().getRemoteAddress() + " connected with unknown extra data " + extraData); + } } } diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java b/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java index d6405c87..280e8731 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/LabyMod.java @@ -61,8 +61,7 @@ public class LabyMod { ByteBuf buf = Unpooled.wrappedBuffer(event.getData()); String purpose = ProtocolUtils.readString(buf); - if (!"INFO".equals(purpose)) - return; + if (!"INFO".equals(purpose)) return; JsonObject message = JsonParser.parseString(ProtocolUtils.readString(buf)).getAsJsonObject(); List mods = new LinkedList<>(); diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java b/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java index 6ad7db4f..78364301 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/ModUtils.java @@ -60,10 +60,11 @@ public class ModUtils { Iterator it = mods.iterator(); while (it.hasNext()) { Mod mod = it.next(); - if (mod.getModType() == ModType.UNKLASSIFIED || mod.getModType() == ModType.GREEN || (mod.getModType() == ModType.YOUTUBER_ONLY && user.hasPerm(UserPerm.RESTRICTED_MODS))) + if (mod.getModType() == ModType.UNKLASSIFIED || mod.getModType() == ModType.GREEN || (mod.getModType() == ModType.YOUTUBER_ONLY && user.hasPerm(UserPerm.RESTRICTED_MODS))) { it.remove(); - else if (mod.getModType() == ModType.RED) + } else if (mod.getModType() == ModType.RED) { max = ModType.RED; + } } if (mods.isEmpty()) { diff --git a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java index e8d280ce..0b79c18f 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java +++ b/VelocityCore/src/de/steamwar/velocitycore/mods/ReplayMod.java @@ -55,12 +55,12 @@ public class ReplayMod extends BasicListener { @Subscribe public void onPlayerJoin(ServerPostConnectEvent event) { Player player = event.getPlayer(); - if (VelocityCore.get().getConfig().lobbyserver().getPlayersConnected().contains(player)) - return; + if (VelocityCore.get().getConfig().lobbyserver().getPlayersConnected().contains(player)) return; Subserver subserver = Subserver.getSubserver(player.getCurrentServer().orElseThrow().getServerInfo()); - if (subserver instanceof Builderserver || (subserver instanceof Bauserver bauserver && bauserver.getOwner().equals(player.getUniqueId())) || DevCommand.getDevServers().containsValue(player.getCurrentServer().orElseThrow().getServer())) + if (subserver instanceof Builderserver || (subserver instanceof Bauserver bauserver && bauserver.getOwner().equals(player.getUniqueId())) || DevCommand.getDevServers().containsValue(player.getCurrentServer().orElseThrow().getServer())) { return; + } PluginMessage.send(player, "Replay|Restrict", "replaymod:restrict", restrict); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java index 40dbee71..206626ca 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java +++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/Tablist.java @@ -67,8 +67,7 @@ public class Tablist extends ChannelInboundHandlerAdapter { } public void update(TablistPart global, int seconds) { - if (connection == null) - return; + if (connection == null) return; player.sendPlayerListHeaderAndFooter(header(viewer, seconds), viewer.parse(false, "TABLIST_FOOTER", connection.getServerInfo().getName(), ping(), VelocityCore.getProxy().getPlayerCount())); @@ -203,8 +202,9 @@ public class Tablist extends ChannelInboundHandlerAdapter { if (packet.containsAction(UpsertPlayerInfoPacket.Action.UPDATE_GAME_MODE)) { for (UpsertPlayerInfoPacket.Entry entry : packet.getEntries()) { - if (!entry.getProfileId().equals(player.getUniqueId()) && entry.getGameMode() == 3) + if (!entry.getProfileId().equals(player.getUniqueId()) && entry.getGameMode() == 3) { entry.setGameMode(1); + } } } } else if (msg instanceof RemovePlayerInfoPacket packet) { @@ -234,8 +234,9 @@ public class Tablist extends ChannelInboundHandlerAdapter { } } else if (packet.getAction() == LegacyPlayerListItemPacket.UPDATE_GAMEMODE) { for (LegacyPlayerListItemPacket.Item entry : packet.getItems()) { - if (!player.getUniqueId().equals(entry.getUuid()) && entry.getGameMode() == 3) + if (!player.getUniqueId().equals(entry.getUuid()) && entry.getGameMode() == 3) { entry.setGameMode(1); + } } } else if (packet.getAction() == LegacyPlayerListItemPacket.REMOVE_PLAYER) { for (LegacyPlayerListItemPacket.Item entry : packet.getItems()) { @@ -253,15 +254,15 @@ public class Tablist extends ChannelInboundHandlerAdapter { } private void sendTabPacket(List items, UpsertPlayerInfoPacket.Action action) { //Breaks in 1.19.3 if action != UPDATE_DISPLAY_NAME, ADD_PLAYER or REMOVE_PLAYER - if (items.isEmpty()) - return; + if (items.isEmpty()) return; if (player.getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_19_3)) { int legacyAction = LegacyPlayerListItemPacket.REMOVE_PLAYER; - if (action == UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME) + if (action == UpsertPlayerInfoPacket.Action.UPDATE_DISPLAY_NAME) { legacyAction = LegacyPlayerListItemPacket.UPDATE_DISPLAY_NAME; - else if (action == UpsertPlayerInfoPacket.Action.ADD_PLAYER) + } else if (action == UpsertPlayerInfoPacket.Action.ADD_PLAYER) { legacyAction = LegacyPlayerListItemPacket.ADD_PLAYER; + } sendPacket(player, new LegacyPlayerListItemPacket(legacyAction, items.stream().map(item -> new LegacyPlayerListItemPacket .Item(item.getProfileId()) @@ -286,10 +287,11 @@ public class Tablist extends ChannelInboundHandlerAdapter { private Component header(Chatter p, int seconds) { int phase = (seconds % 10) / 5; - if (phase == 0) + if (phase == 0) { return p.parse(false, "TABLIST_PHASE_DISCORD"); - else + } else { return p.parse(false, "TABLIST_PHASE_WEBSITE"); + } } private String ping() { @@ -307,8 +309,7 @@ public class Tablist extends ChannelInboundHandlerAdapter { private Component getDisplayName(UpsertPlayerInfoPacket.Entry entry) { ComponentHolder displayName = entry.getDisplayName(); - if (displayName == null) - return null; + if (displayName == null) return null; return displayName.getComponent(); } diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java index 60f0321e..15c46a71 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java +++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistBuild.java @@ -38,8 +38,9 @@ public class TablistBuild implements TablistPart { public TablistBuild() { for (RegisteredServer server : VelocityCore.getProxy().getAllServers()) { - if (server.getPlayersConnected().isEmpty() || !Subserver.isBuild(Subserver.getSubserver(server.getServerInfo()))) + if (server.getPlayersConnected().isEmpty() || !Subserver.isBuild(Subserver.getSubserver(server.getServerInfo()))) { continue; + } servers.add(server); players.put(server, server.getPlayersConnected().stream().sorted(((p1, p2) -> p1.getUsername().compareToIgnoreCase(p2.getUsername()))).map(Item::new).toList()); diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java index 5d57927e..7d2fc7ae 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java +++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistManager.java @@ -67,8 +67,9 @@ public class TablistManager extends BasicListener implements Disable { tablists.computeIfAbsent(event.getPlayer(), Tablist::new).onServerSwitch(); } - if (event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20)) + if (event.getPlayer().getProtocolVersion().lessThan(ProtocolVersion.MINECRAFT_1_20)) { Tablist.sendPacket(event.getPlayer(), Tablist.createTeamPacket); + } } @Subscribe @@ -96,14 +97,14 @@ public class TablistManager extends BasicListener implements Disable { private void updateTablist() { List subservers = new ArrayList<>(); for (RegisteredServer server : new ArrayList<>(VelocityCore.getProxy().getAllServers())) { - if (server.getPlayersConnected().isEmpty()) - continue; + if (server.getPlayersConnected().isEmpty()) continue; Subserver subserver = Subserver.getSubserver(server.getServerInfo()); - if (fightInfos.containsKey(server)) + if (fightInfos.containsKey(server)) { subservers.add(new TablistServer(server, fightInfos.get(server))); - else if (!Subserver.isBuild(subserver)) + } else if (!Subserver.isBuild(subserver)) { subservers.add(new TablistServer(server)); + } } subservers.add(new TablistBuild()); subservers.sort((s1, s2) -> s1.sortKey().compareToIgnoreCase(s2.sortKey())); diff --git a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java index 2393ae32..0c6cf89f 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java +++ b/VelocityCore/src/de/steamwar/velocitycore/tablist/TablistServer.java @@ -93,8 +93,9 @@ public class TablistServer implements TablistPart { return players.stream().map(item -> { Player p = VelocityCore.getProxy().getPlayer(item.getUuid()).orElse(null); if (p == null) return item; - if (Subserver.isArena(Subserver.getSubserver(p.getCurrentServer().map(ServerConnection::getServerInfo).orElse(null)))) + if (Subserver.isArena(Subserver.getSubserver(p.getCurrentServer().map(ServerConnection::getServerInfo).orElse(null)))) { return item; + } if (SteamwarUser.get(p.getUniqueId()).getTeam() != team) return item; return new Item(p, true); }); diff --git a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java index 093e1b81..2053d6cf 100644 --- a/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java +++ b/VelocityCore/src/de/steamwar/velocitycore/util/BauLock.java @@ -40,13 +40,13 @@ public class BauLock { owner.system("BAU_LOCKED_" + state.name()); Bauserver bauserver = Bauserver.get(owner.user().getUUID()); - if (bauserver != null) + if (bauserver != null) { bauserver.getRegisteredServer().getPlayersConnected().stream().findAny().ifPresent(player -> NetworkSender.send(player, new BaulockUpdatePacket())); + } } public static boolean isLocked(SteamwarUser owner, SteamwarUser target) { - if (owner.getId() == target.getId()) - return false; + if (owner.getId() == target.getId()) return false; boolean locked; String state = UserConfig.getConfig(owner.getId(), BAU_LOCK_CONFIG_NAME); diff --git a/WebsiteBackend/src/de/steamwar/routes/Schematic.kt b/WebsiteBackend/src/de/steamwar/routes/Schematic.kt index 77efeed6..0a10d5d7 100644 --- a/WebsiteBackend/src/de/steamwar/routes/Schematic.kt +++ b/WebsiteBackend/src/de/steamwar/routes/Schematic.kt @@ -140,12 +140,13 @@ fun Route.configureSchematic() { if (schem.size() == 1) schem = schem.first() as CompoundTag val version = schem.let { - if (it.contains("Materials")) - return@let SchematicFormat.MCEDIT - else if (it.contains("Blocks")) - return@let SchematicFormat.SPONGE_V3 - else - return@let SchematicFormat.SPONGE_V2 + if (it.contains("Materials")) { + SchematicFormat.MCEDIT + } else if (it.contains("Blocks")) { + SchematicFormat.SPONGE_V3 + } else { + SchematicFormat.SPONGE_V2 + } } if (version == SchematicFormat.SPONGE_V3) {