From 4897d8ef7703c3a7b23184457f78b7fd06608d3e Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 3 Jun 2018 10:23:45 +0200 Subject: [PATCH] Fixed some code smells --- .../bskyblock/database/objects/Island.java | 7 +++---- .../bskyblock/generators/NetherPopulator.java | 8 +++----- .../bskyblock/island/builders/Clipboard.java | 3 --- .../listeners/flags/AbstractFlagListener.java | 15 +++++++-------- .../listeners/flags/BreakBlocksListener.java | 9 +++------ .../listeners/flags/BreedingListener.java | 2 +- .../listeners/flags/HurtingListener.java | 4 ++-- .../bskyblock/listeners/flags/PVPListener.java | 6 +++--- .../listeners/protection/FlyingMobEvents.java | 8 +++----- .../bskyblock/managers/IslandsManager.java | 8 +++----- 10 files changed, 28 insertions(+), 42 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java index 9ae04e52e..d3276f9af 100755 --- a/src/main/java/us/tastybento/bskyblock/database/objects/Island.java +++ b/src/main/java/us/tastybento/bskyblock/database/objects/Island.java @@ -315,10 +315,9 @@ public class Island implements DataObject { } } else if (material.toString().endsWith("BANNER") && holder.getType().toString().endsWith("BANNER")) { result++; - } else if (material.equals(Material.WALL_SIGN) || material.equals(Material.SIGN_POST)) { - if (holder.getType().equals(Material.WALL_SIGN) || holder.getType().equals(Material.SIGN_POST)) { - result++; - } + } else if ((material.equals(Material.WALL_SIGN) || material.equals(Material.SIGN_POST)) + && (holder.getType().equals(Material.WALL_SIGN) || holder.getType().equals(Material.SIGN_POST))) { + result++; } } } diff --git a/src/main/java/us/tastybento/bskyblock/generators/NetherPopulator.java b/src/main/java/us/tastybento/bskyblock/generators/NetherPopulator.java index cbaf8f018..ded89fced 100644 --- a/src/main/java/us/tastybento/bskyblock/generators/NetherPopulator.java +++ b/src/main/java/us/tastybento/bskyblock/generators/NetherPopulator.java @@ -111,14 +111,12 @@ public class NetherPopulator extends BlockPopulator { } else if (b.getType().equals(Material.DIRT)) { world.generateTree(source.getBlock(x, y + 1, z).getLocation(), TreeType.BROWN_MUSHROOM); b.setType(Material.SOUL_SAND); - } else if (b.getType().equals(Material.SOUL_SAND) && b.getRelative(BlockFace.UP).getType().equals(Material.AIR)) { - if (random.nextInt(9) == 1) { - b.getRelative(BlockFace.UP).setType(Material.NETHER_WARTS); - } + } else if (b.getType().equals(Material.SOUL_SAND) && b.getRelative(BlockFace.UP).getType().equals(Material.AIR) + && random.nextInt(9) == 1) { + b.getRelative(BlockFace.UP).setType(Material.NETHER_WARTS); } } } } } - } diff --git a/src/main/java/us/tastybento/bskyblock/island/builders/Clipboard.java b/src/main/java/us/tastybento/bskyblock/island/builders/Clipboard.java index d570c99c5..b65243131 100644 --- a/src/main/java/us/tastybento/bskyblock/island/builders/Clipboard.java +++ b/src/main/java/us/tastybento/bskyblock/island/builders/Clipboard.java @@ -378,14 +378,11 @@ public class Clipboard { try (ZipOutputStream zipOutputStream = new ZipOutputStream(new FileOutputStream(targetFile.getAbsolutePath() + ".schem"))) { zipOutputStream.putNextEntry(new ZipEntry(targetFile.getName())); try (FileInputStream inputStream = new FileInputStream(targetFile)) { - final byte[] buffer = new byte[1024]; int length; while((length = inputStream.read(buffer)) >= 0) { zipOutputStream.write(buffer, 0, length); } - inputStream.close(); - zipOutputStream.close(); try { Files.delete(targetFile.toPath()); } catch (Exception e) { diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/AbstractFlagListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/AbstractFlagListener.java index 391ac0cdf..a2236fe11 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/AbstractFlagListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/AbstractFlagListener.java @@ -134,15 +134,14 @@ public abstract class AbstractFlagListener implements Listener { // Protection flag // If the user is not set already, try to get it from the event - if (user == null) { - // Set the user associated with this event - if (!createEventUser(e)) { - // The user is not set, and the event does not hold a getPlayer, so return false - // TODO: is this the correct handling here? - plugin.logError("Check island had no associated user! " + e.getEventName()); - return false; - } + // Set the user associated with this event + // The user is not set, and the event does not hold a getPlayer, so return false + // TODO: is this the correct handling here? + if (user == null && !createEventUser(e)) { + plugin.logError("Check island had no associated user! " + e.getEventName()); + return false; } + // Check if the plugin is set in User (required for testing) User.setPlugin(plugin); diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java index 15d9b86f0..b7086f425 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java @@ -128,13 +128,10 @@ public class BreakBlocksListener extends AbstractFlagListener { } else if (e.getDamager() instanceof Projectile) { // Find out who fired the arrow Projectile p = (Projectile) e.getDamager(); - if (p.getShooter() instanceof Player) { - if (!setUser(User.getInstance((Player)p.getShooter())).checkIsland(e, e.getEntity().getLocation(), Flags.BREAK_BLOCKS)) { - e.getEntity().setFireTicks(0); - e.getDamager().remove(); - } + if (p.getShooter() instanceof Player && !setUser(User.getInstance((Player)p.getShooter())).checkIsland(e, e.getEntity().getLocation(), Flags.BREAK_BLOCKS)) { + e.getEntity().setFireTicks(0); + e.getDamager().remove(); } } } - } diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/BreedingListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreedingListener.java index 2b5d90f60..4437f1e02 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/BreedingListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreedingListener.java @@ -34,7 +34,7 @@ public class BreedingListener extends AbstractFlagListener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled=true) public void onPlayerInteract(final PlayerInteractAtEntityEvent e) { - if (e.getRightClicked() != null && e.getRightClicked() instanceof Animals) { + if (e.getRightClicked() instanceof Animals) { ItemStack inHand = e.getPlayer().getInventory().getItemInMainHand(); if (e.getHand().equals(EquipmentSlot.OFF_HAND)) { inHand = e.getPlayer().getInventory().getItemInOffHand(); diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/HurtingListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/HurtingListener.java index fe25f08f4..6b252e458 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/HurtingListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/HurtingListener.java @@ -118,7 +118,7 @@ public class HurtingListener extends AbstractFlagListener { public void onSplashPotionSplash(final PotionSplashEvent e) { // Try to get the shooter Projectile projectile = e.getEntity(); - if (projectile.getShooter() != null && projectile.getShooter() instanceof Player) { + if (projectile.getShooter() instanceof Player) { Player attacker = (Player)projectile.getShooter(); // Run through all the affected entities for (LivingEntity entity: e.getAffectedEntities()) { @@ -162,7 +162,7 @@ public class HurtingListener extends AbstractFlagListener { public void onLingeringPotionSplash(final LingeringPotionSplashEvent e) { // Try to get the shooter Projectile projectile = e.getEntity(); - if (projectile.getShooter() != null && projectile.getShooter() instanceof Player) { + if (projectile.getShooter() instanceof Player) { UUID uuid = ((Player)projectile.getShooter()).getUniqueId(); // Store it and remove it when the effect is gone thrownPotions.put(e.getAreaEffectCloud().getEntityId(), uuid); diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/PVPListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/PVPListener.java index 07e1e0a66..185e6e26f 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/PVPListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/PVPListener.java @@ -69,7 +69,7 @@ public class PVPListener extends AbstractFlagListener { @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onFishing(PlayerFishEvent e) { - if (e.getCaught() != null && e.getCaught() instanceof Player) { + if (e.getCaught() instanceof Player) { Flag flag = Flags.PVP_OVERWORLD; if (e.getCaught().getWorld().equals(getPlugin().getIWM().getNetherWorld())) { flag = Flags.PVP_NETHER; @@ -98,7 +98,7 @@ public class PVPListener extends AbstractFlagListener { // Try to get the thrower Projectile projectile = e.getEntity(); - if (projectile.getShooter() != null && projectile.getShooter() instanceof Player) { + if (projectile.getShooter() instanceof Player) { Player attacker = (Player)projectile.getShooter(); // Run through all the affected entities for (LivingEntity entity: e.getAffectedEntities()) { @@ -122,7 +122,7 @@ public class PVPListener extends AbstractFlagListener { public void onLingeringPotionSplash(final LingeringPotionSplashEvent e) { // Try to get the shooter Projectile projectile = e.getEntity(); - if (projectile.getShooter() != null && projectile.getShooter() instanceof Player) { + if (projectile.getShooter() instanceof Player) { UUID uuid = ((Player) projectile.getShooter()).getUniqueId(); // Store it and remove it when the effect is gone thrownPotions.put(e.getAreaEffectCloud().getEntityId(), uuid); diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/FlyingMobEvents.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/FlyingMobEvents.java index e66728152..8f446483b 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/FlyingMobEvents.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/FlyingMobEvents.java @@ -142,12 +142,10 @@ public class FlyingMobEvents implements Listener { if (e.getEntityType() != EntityType.WITHER || !plugin.getIWM().inWorld(e.getEntity().getLocation()) ) { return; } - if (mobSpawnInfo.containsKey(e.getEntity())) { + if (mobSpawnInfo.containsKey(e.getEntity()) && !mobSpawnInfo.get(e.getEntity()).inIslandSpace(e.getEntity().getLocation())) { // We know about this wither - if (!mobSpawnInfo.get(e.getEntity()).inIslandSpace(e.getEntity().getLocation())) { - // Cancel the block changes - e.setCancelled(true); - } + // Cancel the block changes + e.setCancelled(true); } } diff --git a/src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java index 8e58bc18d..324cb4236 100644 --- a/src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/managers/IslandsManager.java @@ -378,11 +378,9 @@ public class IslandsManager { } else { // try team leader's home Location tlh = plugin.getPlayers().getHomeLocation(world, plugin.getIslands().getTeamLeader(world, user.getUniqueId())); - if (tlh != null) { - if (isSafeLocation(tlh)) { - plugin.getPlayers().setHomeLocation(user, tlh, number); - return tlh; - } + if (tlh != null && isSafeLocation(tlh)) { + plugin.getPlayers().setHomeLocation(user, tlh, number); + return tlh; } } } else {