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