瀏覽代碼

Fixing small typo

RedstoneFuture 3 年之前
父節點
當前提交
043a2d764d

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

@@ -315,7 +315,7 @@ public class GameListener extends GameBoundListener {
 
         MWPlayer player = getGame().getPlayer(e.getPlayer());
         if (player == null) return;
-        BukkitTask task = game.getPlayerTasks().get(player.getUUID());
+        BukkitTask task = game.getPlayerTasks().get(player.getUuid());
         if (task != null) task.cancel();
 
         Team team = player.getTeam();

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/listener/PlayerListener.java

@@ -144,7 +144,7 @@ public class PlayerListener implements Listener {
         Game game = event.getGame();
 
         MWPlayer mwPlayer = game.getPlayer(event.getPlayer());
-        Player player= mwPlayer.getPlayer();
+        Player player = mwPlayer.getPlayer();
 
         PlayerDataProvider.getInstance().loadInventory(player);
 

+ 3 - 3
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/game/Team.java

@@ -79,7 +79,7 @@ public class Team {
             p.setDisplayName("§7" + p.getName() + "§r");
         }
 
-        members.removeIf(mp -> mp.getUUID().equals(player.getUUID()));
+        members.removeIf(mp -> mp.getUuid().equals(player.getUuid()));
 
         game.getScoreboardManager().resetScoreboard();
         p.setScoreboard(Bukkit.getScoreboardManager().getMainScoreboard());
@@ -95,7 +95,7 @@ public class Team {
 
         Player p = player.getPlayer();
         if (p == null) {
-            Logger.WARN.log("Could not add player " + player.getUUID().toString() + " to a team because he went offline");
+            Logger.WARN.log("Could not add player " + player.getUuid().toString() + " to a team because he went offline");
             return;
         }
 
@@ -181,7 +181,7 @@ public class Team {
                 break;
         }
 
-        MoneyUtil.giveMoney(missileWarsPlayer.getUUID(), money);
+        MoneyUtil.giveMoney(missileWarsPlayer.getUuid(), money);
     }
 
     /**

+ 7 - 6
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/player/MWPlayer.java

@@ -34,13 +34,13 @@ import java.util.concurrent.atomic.AtomicLong;
  * @author Butzlabben
  * @since 01.01.2018
  */
-@EqualsAndHashCode(of = {"UUID", "id"})
+@EqualsAndHashCode(of = {"uuid", "id"})
 @Getter
 public class MWPlayer implements Runnable {
 
     private static final AtomicLong NEXT_ID = new AtomicLong(0);
     final long id = NEXT_ID.getAndIncrement();
-    private final UUID UUID;
+    private final UUID uuid;
     private final Game game;
     int i = -1;
     @Setter private Team team;
@@ -48,17 +48,18 @@ public class MWPlayer implements Runnable {
     @Setter private int period;
 
     public MWPlayer(Player player, Game game) {
-        this.UUID = player.getUniqueId();
+        this.uuid = player.getUniqueId();
         this.game = game;
     }
 
     public Player getPlayer() {
-        return Bukkit.getPlayer(UUID);
+        return Bukkit.getPlayer(uuid);
     }
 
     @Override
     public void run() {
-        Player p = Bukkit.getPlayer(UUID);
+
+        Player p = Bukkit.getPlayer(uuid);
         if (p == null || !p.isOnline()) return;
 
         if (i == -1) {
@@ -77,6 +78,6 @@ public class MWPlayer implements Runnable {
 
     @Override
     public String toString() {
-        return "MWPlayer(uuid=" + UUID + ", id=" + id + ", teamName=" + getTeam().getName() + ")";
+        return "MWPlayer(uuid=" + uuid + ", id=" + id + ", teamName=" + getTeam().getName() + ")";
     }
 }

+ 1 - 1
missilewars-plugin/src/main/java/de/butzlabben/missilewars/wrapper/stats/FightStats.java

@@ -108,7 +108,7 @@ public class FightStats {
                     PreparedStatement statement = ConnectionHolder.prepareStatement("INSERT INTO " + Config.getFightMembersTable() + " (fid, player, team) VALUES "
                             + " (?, ?, ?)");
                     statement.setInt(1, fightID);
-                    statement.setString(2, player.getUUID().toString());
+                    statement.setString(2, player.getUuid().toString());
 
                     if (player.getTeam() == game.getTeam1())
                         statement.setInt(3, 1);