Improve code smells

BentoBoxWorld · Jul 31, 2021 · ec25abd · ec25abd
1 parent 229dff6
commit ec25abd
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 39 deletions.
diff --git a/src/main/java/world/bentobox/boxed/Boxed.java b/src/main/java/world/bentobox/boxed/Boxed.java
@@ -53,7 +53,6 @@ public class Boxed extends GameModeAddon {
     private AdvancementsManager advManager;
     private DeleteGen delChunks;
     private ChunkGenerator netherChunkGenerator;
-    private PlaceholdersManager phManager;
 
     @Override
     public void onLoad() {
@@ -130,7 +129,7 @@ public void onEnable(){
         this.registerListener(new EnderPearlListener(this));
 
         // Register placeholders
-        phManager = new PlaceholdersManager(this);
+        PlaceholdersManager phManager  = new PlaceholdersManager(this);
         getPlugin().getPlaceholdersManager().registerPlaceholder(this,"visited_island_advancements", phManager::getCountByLocation);
         getPlugin().getPlaceholdersManager().registerPlaceholder(this,"island_advancements", phManager::getCount);
 

diff --git a/src/main/java/world/bentobox/boxed/generators/AbstractBoxedBiomeGenerator.java b/src/main/java/world/bentobox/boxed/generators/AbstractBoxedBiomeGenerator.java
@@ -50,7 +50,7 @@ abstract class AbstractBoxedBiomeGenerator implements BiomeGenerator {
     private final Biome defaultBiome;
 
 
-    public AbstractBoxedBiomeGenerator(Boxed boxed, Environment env, Biome defaultBiome) {
+    protected AbstractBoxedBiomeGenerator(Boxed boxed, Environment env, Biome defaultBiome) {
         this.addon = boxed;
         this.defaultBiome = defaultBiome;
         dist = addon.getSettings().getIslandDistance();

diff --git a/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java b/src/main/java/world/bentobox/boxed/listeners/AdvancementListener.java
@@ -252,42 +252,11 @@ private void grantAdv(User user, List<String> list) {
         }
     }
 
-    @SuppressWarnings("deprecation")
+
     private void clearAdv(User user) {
         // Clear stats
         // Statistics
-        Arrays.stream(Statistic.values()).forEach(s -> {
-            switch(s.getType()) {
-            case BLOCK:
-                for (Material m: Material.values()) {
-                    if (m.isBlock() && !m.isLegacy()) {
-                        user.getPlayer().setStatistic(s, m, 0);
-                    }
-                }
-                break;
-            case ITEM:
-                for (Material m: Material.values()) {
-                    if (m.isItem() && !m.isLegacy()) {
-                        user.getPlayer().setStatistic(s, m, 0);
-                    }
-                }
-                break;
-            case ENTITY:
-                for (EntityType en: EntityType.values()) {
-                    if (en.isAlive()) {
-                        user.getPlayer().setStatistic(s, en, 0);
-                    }
-                }
-                break;
-            case UNTYPED:
-                user.getPlayer().setStatistic(s, 0);
-                break;
-            default:
-                break;
-
-            }
-
-        });
+        Arrays.stream(Statistic.values()).forEach(s -> resetStats(user, s));
         // Clear advancements
         Iterator<Advancement> it = Bukkit.advancementIterator();
         while (it.hasNext()) {
@@ -298,4 +267,37 @@ private void clearAdv(User user) {
 
     }
 
+    @SuppressWarnings("deprecation")
+    private void resetStats(User user, Statistic s) {
+        switch(s.getType()) {
+        case BLOCK:
+            for (Material m: Material.values()) {
+                if (m.isBlock() && !m.isLegacy()) {
+                    user.getPlayer().setStatistic(s, m, 0);
+                }
+            }
+            break;
+        case ITEM:
+            for (Material m: Material.values()) {
+                if (m.isItem() && !m.isLegacy()) {
+                    user.getPlayer().setStatistic(s, m, 0);
+                }
+            }
+            break;
+        case ENTITY:
+            for (EntityType en: EntityType.values()) {
+                if (en.isAlive()) {
+                    user.getPlayer().setStatistic(s, en, 0);
+                }
+            }
+            break;
+        case UNTYPED:
+            user.getPlayer().setStatistic(s, 0);
+            break;
+        default:
+            break;
+
+        }
+    }
+
 }
diff --git a/src/main/java/world/bentobox/boxed/listeners/EnderPearlListener.java b/src/main/java/world/bentobox/boxed/listeners/EnderPearlListener.java
@@ -43,10 +43,10 @@ public void onEnderPearlLand(ProjectileHitEvent e) {
         }
         Location l = e.getHitBlock().getRelative(BlockFace.UP).getLocation();
         EnderPearl ep = (EnderPearl)e.getEntity();
-        if (ep.getShooter() instanceof Player) {
-            User u = User.getInstance((Player)ep.getShooter());
+        if (ep.getShooter() instanceof Player player) {
+            User u = User.getInstance(player);
             addon.getIslands().getIslandAt(l).ifPresent(i -> {
-             // Check flag
+                // Check flag
                 if (i.isAllowed(u, Boxed.MOVE_BOX) && addon.getIslands().isSafeLocation(l)) {
                     // Reset home locations
                     i.getMemberSet().forEach(uuid -> {