From cac3e3de39da1090f1555357525ac16006db8f80 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Thu, 5 May 2016 20:46:08 +0200 Subject: [PATCH] Minor method naming changes --- .../dre2n/dungeonsxl/command/PlayCommand.java | 2 +- .../io/github/dre2n/dungeonsxl/game/Game.java | 2 +- .../dungeonsxl/listener/PlayerListener.java | 8 +++---- .../dre2n/dungeonsxl/player/DGamePlayer.java | 18 +++++++------- .../dre2n/dungeonsxl/sign/LobbySign.java | 2 +- .../dre2n/dungeonsxl/sign/StartSign.java | 2 +- .../dre2n/dungeonsxl/world/EditWorld.java | 4 ++-- .../dre2n/dungeonsxl/world/GameWorld.java | 24 +++++++++---------- 8 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java index 094d145c..a1648ca2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java @@ -163,7 +163,7 @@ public class PlayCommand extends BRCommand { return; } - if (dGroup.getGameWorld().getLocLobby() == null) { + if (dGroup.getGameWorld().getLobbyLocation() == null) { for (Player groupPlayer : dGroup.getPlayers()) { new DGamePlayer(groupPlayer, dGroup.getGameWorld()); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java b/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java index 27189193..c3b0d514 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java @@ -295,7 +295,7 @@ public class Game { public void run() { if (teleport) { for (Player player : getPlayers()) { - PlayerUtil.secureTeleport(player, world.getLocStart()); + PlayerUtil.secureTeleport(player, world.getStartLocation()); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java b/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java index faad252d..0973373d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java @@ -364,11 +364,11 @@ public class PlayerListener implements Listener { return; } - if (editWorld.getLobby() == null) { + if (editWorld.getLobbyLocation() == null) { event.setRespawnLocation(editWorld.getWorld().getSpawnLocation()); } else { - event.setRespawnLocation(editWorld.getLobby()); + event.setRespawnLocation(editWorld.getLobbyLocation()); } } else { @@ -383,11 +383,11 @@ public class PlayerListener implements Listener { Location respawn = dPlayer.getCheckpoint(); if (respawn == null) { - respawn = dGroup.getGameWorld().getLocStart(); + respawn = dGroup.getGameWorld().getStartLocation(); } if (respawn == null) { - respawn = dGroup.getGameWorld().getLocLobby(); + respawn = dGroup.getGameWorld().getLobbyLocation(); } if (respawn == null) { diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java index 5994f343..79fa1bc8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java @@ -114,7 +114,7 @@ public class DGamePlayer extends DGlobalPlayer { if (this.editing) { this.getPlayer().setGameMode(GameMode.CREATIVE); clearPlayerData(); - teleport = EditWorld.getByWorld(world).getLobby(); + teleport = EditWorld.getByWorld(world).getLobbyLocation(); } else { WorldConfig worldConfig = GameWorld.getByWorld(world).getConfig(); @@ -127,7 +127,7 @@ public class DGamePlayer extends DGlobalPlayer { } initialLives = worldConfig.getInitialLives(); lives = initialLives; - teleport = GameWorld.getByWorld(world).getLocLobby(); + teleport = GameWorld.getByWorld(world).getLobbyLocation(); } if (teleport == null) { @@ -621,11 +621,11 @@ public class DGamePlayer extends DGlobalPlayer { Location respawn = checkpoint; if (respawn == null) { - respawn = dGroup.getGameWorld().getLocStart(); + respawn = dGroup.getGameWorld().getStartLocation(); } if (respawn == null) { - respawn = dGroup.getGameWorld().getLocLobby(); + respawn = dGroup.getGameWorld().getLobbyLocation(); } if (respawn == null) { @@ -712,7 +712,7 @@ public class DGamePlayer extends DGlobalPlayer { for (Player player : dGroup.getPlayers()) { DGamePlayer dPlayer = getByPlayer(player); dPlayer.setWorld(gameWorld.getWorld()); - dPlayer.setCheckpoint(dGroup.getGameWorld().getLocStart()); + dPlayer.setCheckpoint(dGroup.getGameWorld().getStartLocation()); if (dPlayer.getWolf() != null) { dPlayer.getWolf().teleport(dPlayer.getCheckpoint()); } @@ -860,10 +860,10 @@ public class DGamePlayer extends DGlobalPlayer { if (isEditing()) { if (editWorld != null) { - if (editWorld.getLobby() == null) { + if (editWorld.getLobbyLocation() == null) { teleportLocation = editWorld.getWorld().getSpawnLocation(); } else { - teleportLocation = editWorld.getLobby(); + teleportLocation = editWorld.getLobbyLocation(); } } @@ -873,11 +873,11 @@ public class DGamePlayer extends DGlobalPlayer { teleportLocation = getCheckpoint(); if (teleportLocation == null) { - teleportLocation = dGroup.getGameWorld().getLocStart(); + teleportLocation = dGroup.getGameWorld().getStartLocation(); } if (teleportLocation == null) { - teleportLocation = dGroup.getGameWorld().getLocLobby(); + teleportLocation = dGroup.getGameWorld().getLobbyLocation(); } if (teleportLocation == null) { diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java index 14367734..b7dc5426 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java @@ -38,7 +38,7 @@ public class LobbySign extends DSign { @Override public void onInit() { - getGameWorld().setLocLobby(getSign().getLocation()); + getGameWorld().setLobbyLocation(getSign().getLocation()); getSign().getBlock().setType(Material.AIR); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java index 5d4252c0..451e5c44 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java @@ -38,7 +38,7 @@ public class StartSign extends DSign { @Override public void onInit() { - getGameWorld().setLocStart(getSign().getLocation()); + getGameWorld().setStartLocation(getSign().getLocation()); getSign().getBlock().setType(Material.AIR); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java index 85319408..39cd9b88 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java @@ -158,9 +158,9 @@ public class EditWorld { } /** - * @return the lobby + * @return the location of the lobby */ - public Location getLobby() { + public Location getLobbyLocation() { return lobby; } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java index d8579174..cb126e9b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java @@ -182,33 +182,33 @@ public class GameWorld { } /** - * @return the locLobby + * @return the location of the lobby */ - public Location getLocLobby() { + public Location getLobbyLocation() { return locLobby; } /** - * @param locLobby - * the locLobby to set + * @param location + * the location of the lobby to set */ - public void setLocLobby(Location locLobby) { - this.locLobby = locLobby; + public void setLobbyLocation(Location location) { + this.locLobby = location; } /** - * @return the locStart + * @return the start location */ - public Location getLocStart() { + public Location getStartLocation() { return locStart; } /** - * @param locStart - * the locStart to set + * @param location + * the location to start to set */ - public void setLocStart(Location locStart) { - this.locStart = locStart; + public void setStartLocation(Location location) { + this.locStart = location; } /**