2
0
Эх сурвалжийг харах

Code cleaning, small typos

RedstoneFuture 2 жил өмнө
parent
commit
5acb970719

+ 3 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/GameBoundListener.java

@@ -55,7 +55,7 @@ public abstract class GameBoundListener implements Listener {
         MWPlayer mwPlayer = getGame().getPlayer(player);
         if (mwPlayer == null) return false;
 
-        return getGame().getPlayer(player).isPlayerInteractEventCancel();
+        return mwPlayer.isPlayerInteractEventCancel();
     }
 
     /**
@@ -68,7 +68,7 @@ public abstract class GameBoundListener implements Listener {
         MWPlayer mwPlayer = getGame().getPlayer(player);
         if (mwPlayer == null) return;
 
-        getGame().getPlayer(player).setPlayerInteractEventCancel(true);
-        Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> getGame().getPlayer(player).setPlayerInteractEventCancel(false), 20);
+        mwPlayer.setPlayerInteractEventCancel(true);
+        Bukkit.getScheduler().runTaskLater(MissileWars.getInstance(), () -> mwPlayer.setPlayerInteractEventCancel(false), 20);
     }
 }

+ 9 - 8
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/GameListener.java

@@ -183,15 +183,14 @@ public class GameListener extends GameBoundListener {
     public void onThrow(ProjectileLaunchEvent event) {
         if (!isInGameWorld(event.getEntity().getLocation())) return;
 
-        if (event.getEntity() instanceof Snowball) {
-            Snowball snowball = (Snowball) event.getEntity();
+        if (!(event.getEntity() instanceof Snowball)) return;
 
-            if (!(snowball.getShooter() instanceof Player)) return;
+        Snowball snowball = (Snowball) event.getEntity();
+        if (!(snowball.getShooter() instanceof Player)) return;
 
-            Player shooter = (Player) snowball.getShooter();
-            Shield shield = new Shield(shooter, getGame().getArena().getShieldConfiguration());
-            shield.onThrow(event);
-        }
+        Player shooter = (Player) snowball.getShooter();
+        Shield shield = new Shield(shooter, getGame().getArena().getShieldConfiguration());
+        shield.onThrow(event);
     }
 
     @EventHandler
@@ -213,7 +212,9 @@ public class GameListener extends GameBoundListener {
 
             shooter = (Player) event.getDamager();
 
-        } else return;
+        } else {
+            return;
+        }
 
         Team team = getGame().getPlayer(shooter).getTeam();
         if (team == null) return;

+ 2 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/LobbyListener.java

@@ -67,7 +67,7 @@ public class LobbyListener extends GameBoundListener {
         if (event.getItem() == null) return;
 
         if (VersionUtil.isStainedGlassPane(event.getItem().getType())) {
-            // team switch:
+            // team change:
             if (!player.hasPermission("mw.change")) return;
 
             String displayName = event.getItem().getItemMeta().getDisplayName();
@@ -75,7 +75,7 @@ public class LobbyListener extends GameBoundListener {
             // same team:
             if (displayName.equals(getGame().getPlayer(player).getTeam().getFullname())) return;
 
-            // time to late:
+            // too late for team change:
             if (getGame().getTimer().getSeconds() < 10) {
                 player.sendMessage(MessageConfig.getMessage("change_team_not_now"));
                 return;

+ 2 - 2
missilewars-plugin/src/main/java/de/butzlabben/missilewars/util/PlayerEquipmentRandomizer.java

@@ -69,7 +69,7 @@ public class PlayerEquipmentRandomizer {
     }
 
     /**
-     * This method reset the countdown for the player equipment
+     * This method resets the countdown for the player equipment
      * randomizer.
      */
     public void resetPlayerInterval() {
@@ -77,7 +77,7 @@ public class PlayerEquipmentRandomizer {
     }
 
     /**
-     * This method set the countdown for the player equipment
+     * This method sets the countdown for the player equipment
      * randomizer to a specified value.
      *
      * @param playerInterval (Integer) the target interval status