Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-11-28 13:36:33 +01:00
Code Issues Projects Releases Wiki Activity

Continue overhaul

Browse Source 
This commit includes the PlayerListener and a bugfix in onJoin at
servers without Vault.
This commit is contained in:
Daniel Saukel 2015-12-25 15:48:11 +01:00
parent 56f98e6826
commit a018664102
7 changed files with 299 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/io/github/dre2n/dungeonsxl/DungeonsXL.java
View File

@ -1,6 +1,3 @@
/* TODO: Cleanup - Overhaul DPlayer, GameWorld, GameChest & Listeners - MiscUtil - FileUtil -
* Variable names - Triggers */
package io.github.dre2n.dungeonsxl;
import io.github.dre2n.dungeonsxl.command.DCommands;

10
src/io/github/dre2n/dungeonsxl/command/PlayCommand.java
View File

@ -92,15 +92,15 @@ public class PlayCommand extends DCommand {
DGroup dGroup = new DGroup(player, identifier, multiFloor);
if (dGroup.getGWorld() == null) {
dGroup.setGWorld(GameWorld.load(DGroup.get(player).getMapName()));
if (dGroup.getGameWorld() == null) {
dGroup.setGameWorld(GameWorld.load(DGroup.get(player).getMapName()));
}
if (dGroup.getGWorld().getLocLobby() == null) {
new DPlayer(player, dGroup.getGWorld().getWorld(), dGroup.getGWorld().getWorld().getSpawnLocation(), false);
if (dGroup.getGameWorld().getLocLobby() == null) {
new DPlayer(player, dGroup.getGameWorld().getWorld(), dGroup.getGameWorld().getWorld().getSpawnLocation(), false);
} else {
new DPlayer(player, dGroup.getGWorld().getWorld(), dGroup.getGWorld().getLocLobby(), false);
new DPlayer(player, dGroup.getGameWorld().getWorld(), dGroup.getGameWorld().getLocLobby(), false);
}
}

10
src/io/github/dre2n/dungeonsxl/command/TestCommand.java
View File

@ -67,17 +67,17 @@ public class TestCommand extends DCommand {
DGroup dGroup = new DGroup(player, identifier, multiFloor);
if (dGroup.getGWorld() == null) {
dGroup.setGWorld(GameWorld.load(DGroup.get(player).getMapName()));
if (dGroup.getGameWorld() == null) {
dGroup.setGameWorld(GameWorld.load(DGroup.get(player).getMapName()));
}
DPlayer newDPlayer;
if (dGroup.getGWorld().getLocLobby() == null) {
newDPlayer = new DPlayer(player, dGroup.getGWorld().getWorld(), dGroup.getGWorld().getWorld().getSpawnLocation(), false);
if (dGroup.getGameWorld().getLocLobby() == null) {
newDPlayer = new DPlayer(player, dGroup.getGameWorld().getWorld(), dGroup.getGameWorld().getWorld().getSpawnLocation(), false);
} else {
newDPlayer = new DPlayer(player, dGroup.getGWorld().getWorld(), dGroup.getGWorld().getLocLobby(), false);
newDPlayer = new DPlayer(player, dGroup.getGameWorld().getWorld(), dGroup.getGameWorld().getLocLobby(), false);
}
newDPlayer.setIsInTestMode(true);

12
src/io/github/dre2n/dungeonsxl/global/DPortal.java
View File

@ -89,19 +89,19 @@ public class DPortal {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_NotInGroup"));
}
if (dgroup.getGWorld() == null) {
dgroup.setGWorld(GameWorld.load(DGroup.get(player).getMapName()));
if (dgroup.getGameWorld() == null) {
dgroup.setGameWorld(GameWorld.load(DGroup.get(player).getMapName()));
}
if (dgroup.getGWorld() == null) {
if (dgroup.getGameWorld() == null) {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_DungeonNotExist", DGroup.get(player).getMapName()));
}
if (dgroup.getGWorld().getLocLobby() == null) {
new DPlayer(player, dgroup.getGWorld().getWorld(), dgroup.getGWorld().getWorld().getSpawnLocation(), false);
if (dgroup.getGameWorld().getLocLobby() == null) {
new DPlayer(player, dgroup.getGameWorld().getWorld(), dgroup.getGameWorld().getWorld().getSpawnLocation(), false);
} else {
new DPlayer(player, dgroup.getGWorld().getWorld(), dgroup.getGWorld().getLocLobby(), false);
new DPlayer(player, dgroup.getGameWorld().getWorld(), dgroup.getGameWorld().getLocLobby(), false);
}
}

322
src/io/github/dre2n/dungeonsxl/listener/PlayerListener.java
View File

@ -54,10 +54,16 @@ public class PlayerListener implements Listener {
final DPlayer dPlayer = DPlayer.get(player);
GameWorld gameWorld = GameWorld.get(player.getLocation().getWorld());
if (gameWorld != null) {
if (gameWorld == null) {
return;
}
WorldConfig dConfig = gameWorld.getConfig();
if (dPlayer != null) {
if (dPlayer == null) {
return;
}
dPlayer.setLives(dPlayer.getLives() - 1);
if (dPlayer.getLives() == 0 && dPlayer.isReady()) {
@ -83,11 +89,9 @@ public class PlayerListener implements Listener {
}
}
}
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerInteract(PlayerInteractEvent event) {
public void onInteract(PlayerInteractEvent event) {
Player player = event.getPlayer();
Block clickedBlock = event.getClickedBlock();
@ -96,13 +100,13 @@ public class PlayerListener implements Listener {
if (GameWorld.get(player.getWorld()) != null || EditWorld.get(player.getWorld()) != null) {
if (event.getAction() != Action.LEFT_CLICK_BLOCK) {
if (clickedBlock.getType() == Material.ENDER_CHEST) {
if ( !player.isOp()) {// TODO: Permission
if ( !player.hasPermission("dxl.bypass")) {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_Enderchest"));
event.setCancelled(true);
}
} else if (clickedBlock.getType() == Material.BED_BLOCK) {
if ( !player.isOp()) {// TODO: Permission
if ( !player.hasPermission("dxl.bypass")) {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_Bed"));
event.setCancelled(true);
}
@ -114,7 +118,7 @@ public class PlayerListener implements Listener {
if (GameWorld.get(player.getWorld()) != null) {
if (event.getAction() != Action.LEFT_CLICK_BLOCK) {
if (clickedBlock.getType() == Material.DISPENSER) {
if ( !player.isOp()) {
if ( !player.hasPermission("dxl.bypass")) {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_Dispenser"));
event.setCancelled(true);
}
@ -152,9 +156,9 @@ public class PlayerListener implements Listener {
if (EditWorld.get(player.getWorld()) != null) {
if (event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (item.getType() == Material.STICK) {
DPlayer dplayer = DPlayer.get(player);
if (dplayer != null) {
dplayer.poke(clickedBlock);
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer != null) {
dPlayer.poke(clickedBlock);
event.setCancelled(true);
}
}
@ -162,10 +166,10 @@ public class PlayerListener implements Listener {
}
// Trigger UseItem Signs
GameWorld gworld = GameWorld.get(player.getWorld());
if (gworld != null) {
GameWorld gameWorld = GameWorld.get(player.getWorld());
if (gameWorld != null) {
if (event.getAction() == Action.RIGHT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_AIR) {
if (UseItemTrigger.hasTriggers(gworld)) {
if (UseItemTrigger.hasTriggers(gameWorld)) {
String name = null;
if (item.hasItemMeta()) {
if (item.getItemMeta().hasDisplayName()) {
@ -183,7 +187,7 @@ public class PlayerListener implements Listener {
if (name == null) {
name = item.getType().toString();
}
UseItemTrigger trigger = UseItemTrigger.get(name, gworld);
UseItemTrigger trigger = UseItemTrigger.get(name, gameWorld);
if (trigger != null) {
trigger.onTrigger(player);
}
@ -206,15 +210,15 @@ public class PlayerListener implements Listener {
event.setCancelled(true);
}
DPlayer dplayer = DPlayer.get(player);
if (dplayer != null) {
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer != null) {
// Check GameWorld Signs
GameWorld gworld = GameWorld.get(player.getWorld());
if (gworld != null) {
GameWorld gameWorld = GameWorld.get(player.getWorld());
if (gameWorld != null) {
// Trigger InteractTrigger
InteractTrigger trigger = InteractTrigger.get(clickedBlock, gworld);
InteractTrigger trigger = InteractTrigger.get(clickedBlock, gameWorld);
if (trigger != null) {
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
trigger.onTrigger(player);
@ -224,11 +228,11 @@ public class PlayerListener implements Listener {
}
// Class Signs
for (Sign classSign : gworld.getSignClass()) {
for (Sign classSign : gameWorld.getSignClass()) {
if (classSign != null) {
if (classSign.getLocation().distance(clickedBlock.getLocation()) < 1) {
if (event.getAction() == Action.LEFT_CLICK_BLOCK) {
dplayer.setDClass(ChatColor.stripColor(classSign.getLine(1)));
dPlayer.setDClass(ChatColor.stripColor(classSign.getLine(1)));
} else {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_Leftklick"));
}
@ -244,25 +248,30 @@ public class PlayerListener implements Listener {
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerDropItem(PlayerDropItemEvent event) {
public void onDropItem(PlayerDropItemEvent event) {
Player player = event.getPlayer();
// Deny dropping things at the lobby
DGroup dgroup = DGroup.get(player);
if (dgroup != null) {
if ( !dgroup.isPlaying()) {
DGroup dGroup = DGroup.get(player);
if (dGroup == null) {
return;
}
if ( !dGroup.isPlaying()) {
event.setCancelled(true);
return;
}
if ( !DPlayer.get(player).isReady()) {
event.setCancelled(true);
return;
}
DPlayer dplayer = DPlayer.get(player);
GameWorld gworld = GameWorld.get(dplayer.getWorld());
if (dplayer != null) {
for (Material material : gworld.getConfig().getSecureObjects()) {
DPlayer dPlayer = DPlayer.get(player);
GameWorld gameWorld = GameWorld.get(dPlayer.getWorld());
if (dPlayer != null) {
for (Material material : gameWorld.getConfig().getSecureObjects()) {
if (material == event.getItemDrop().getItemStack().getType()) {
event.setCancelled(true);
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_Drop"));
@ -271,62 +280,67 @@ public class PlayerListener implements Listener {
}
}
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerRespawn(PlayerRespawnEvent event) {
public void onRespawn(PlayerRespawnEvent event) {
Player player = event.getPlayer();
DPlayer dplayer = DPlayer.get(player);
DPlayer dPlayer = DPlayer.get(player);
if (dplayer != null) {
if (dplayer.isEditing()) {
EditWorld eworld = EditWorld.get(dplayer.getWorld());
if (eworld != null) {
if (eworld.getLobby() == null) {
event.setRespawnLocation(eworld.getWorld().getSpawnLocation());
if (dPlayer == null) {
return;
}
if (dPlayer.isEditing()) {
EditWorld editWorld = EditWorld.get(dPlayer.getWorld());
if (editWorld == null) {
return;
}
if (editWorld.getLobby() == null) {
event.setRespawnLocation(editWorld.getWorld().getSpawnLocation());
} else {
event.setRespawnLocation(eworld.getLobby());
}
event.setRespawnLocation(editWorld.getLobby());
}
} else {
GameWorld gworld = GameWorld.get(dplayer.getWorld());
GameWorld gameWorld = GameWorld.get(dPlayer.getWorld());
if (gworld != null) {
DGroup dgroup = DGroup.get(dplayer.getPlayer());
if (gameWorld == null) {
return;
}
if (dplayer.getCheckpoint() == null) {
event.setRespawnLocation(dgroup.getGWorld().getLocStart());
DGroup dGroup = DGroup.get(dPlayer.getPlayer());
if (dPlayer.getCheckpoint() == null) {
event.setRespawnLocation(dGroup.getGameWorld().getLocStart());
// Da einige Plugins einen anderen Respawn setzen wird
// ein Scheduler gestartet der den Player nach einer
// Sekunde teleportiert.
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RespawnRunnable(player, dgroup.getGWorld().getLocStart()), 10);
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RespawnRunnable(player, dGroup.getGameWorld().getLocStart()), 10);
if (dplayer.getWolf() != null) {
dplayer.getWolf().teleport(dgroup.getGWorld().getLocStart());
if (dPlayer.getWolf() != null) {
dPlayer.getWolf().teleport(dGroup.getGameWorld().getLocStart());
}
} else {
event.setRespawnLocation(dplayer.getCheckpoint());
event.setRespawnLocation(dPlayer.getCheckpoint());
// Da einige Plugins einen anderen Respawn setzen wird
// ein Scheduler gestartet der den Player nach einer
// Sekunde teleportiert.
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RespawnRunnable(player, dplayer.getCheckpoint()), 10);
plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, new RespawnRunnable(player, dPlayer.getCheckpoint()), 10);
if (dplayer.getWolf() != null) {
dplayer.getWolf().teleport(dplayer.getCheckpoint());
}
}
if (dPlayer.getWolf() != null) {
dPlayer.getWolf().teleport(dPlayer.getCheckpoint());
}
}
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerPortalEvent(PlayerPortalEvent event) {
public void onPortal(PlayerPortalEvent event) {
Player player = event.getPlayer();
Location location = event.getFrom();
DPortal dportal = DPortal.get(location);
@ -338,41 +352,50 @@ public class PlayerListener implements Listener {
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerTeleport(PlayerTeleportEvent event) {
Player player = event.getPlayer();
DPlayer dplayer = DPlayer.get(player);
if (dplayer != null) {
if (dplayer.getWorld() != event.getTo().getWorld()) {
if ( !player.isOp()) {
event.setCancelled(true);
}
}
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
DPlayer dplayer = DPlayer.get(player);
if (dplayer != null) {
if (dplayer.isInDungeonChat()) {
dplayer.msg(player.getDisplayName() + ": " + event.getMessage());
event.setCancelled(true);
}
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerQuit(PlayerQuitEvent event) {
public void onTeleport(PlayerTeleportEvent event) {
Player player = event.getPlayer();
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer != null) {
if (dPlayer == null) {
return;
}
if (dPlayer.getWorld() == event.getTo().getWorld()) {
return;
}
if ( !player.hasPermission("dxl.bypass")) {
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onChat(AsyncPlayerChatEvent event) {
Player player = event.getPlayer();
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer == null) {
return;
}
if (dPlayer.isInDungeonChat()) {
dPlayer.msg(player.getDisplayName() + ": " + event.getMessage());
event.setCancelled(true);
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onQuit(PlayerQuitEvent event) {
Player player = event.getPlayer();
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer == null) {
return;
}
// Check GameWorld
GameWorld gWorld = GameWorld.get(player.getWorld());
if (gWorld != null) {
int timeUntilKickOfflinePlayer = gWorld.getConfig().getTimeUntilKickOfflinePlayer();
GameWorld gameWorld = GameWorld.get(player.getWorld());
if (gameWorld != null) {
int timeUntilKickOfflinePlayer = gameWorld.getConfig().getTimeUntilKickOfflinePlayer();
if (timeUntilKickOfflinePlayer == 0) {
dPlayer.leave();
@ -389,66 +412,78 @@ public class PlayerListener implements Listener {
dPlayer.leave();
}
}
}
@EventHandler(priority = EventPriority.NORMAL)
public void onPlayerJoin(PlayerJoinEvent event) {
public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
// Check dplayers
DPlayer dplayer = DPlayer.get(player.getName());
if (dplayer != null) {
DGroup dgroup = DGroup.get(dplayer.getPlayer());
if (dgroup != null) {
dgroup.getPlayers().remove(dplayer.getPlayer());
dgroup.getPlayers().add(player);
// Check dPlayers
DPlayer dPlayer = DPlayer.get(player.getName());
if (dPlayer != null) {
DGroup dGroup = DGroup.get(dPlayer.getPlayer());
if (dGroup != null) {
dGroup.getPlayers().remove(dPlayer.getPlayer());
dGroup.getPlayers().add(player);
}
dplayer.setPlayer(player);
dPlayer.setPlayer(player);
// Check offlineTime
dplayer.setOfflineTime(0);
dPlayer.setOfflineTime(0);
}
// Tutorial Mode
if (plugin.getMainConfig().isTutorialActivated()) {
if (DPlayer.get(player) == null) {
if (plugin.getMainConfig().getTutorialDungeon() != null && plugin.getMainConfig().getTutorialStartGroup() != null && plugin.getMainConfig().getTutorialEndGroup() != null) {
if ( !plugin.getMainConfig().isTutorialActivated()) {
return;
}
if (DPlayer.get(player) != null) {
return;
}
if (plugin.getPermissionProvider() == null) {
return;
}
if ((plugin.getMainConfig().getTutorialDungeon() == null || plugin.getMainConfig().getTutorialStartGroup() == null || plugin.getMainConfig().getTutorialEndGroup() == null)) {
return;
}
for (String group : plugin.getPermissionProvider().getPlayerGroups(player)) {
if (plugin.getMainConfig().getTutorialStartGroup().equalsIgnoreCase(group)) {
DGroup dgroup = new DGroup(player, plugin.getMainConfig().getTutorialDungeon(), false);
if (dgroup.getGWorld() == null) {
dgroup.setGWorld(GameWorld.load(DGroup.get(player).getMapName()));
dgroup.getGWorld().setTutorial(true);
if ( !plugin.getMainConfig().getTutorialStartGroup().equalsIgnoreCase(group)) {
continue;
}
if (dgroup.getGWorld() != null) {
if (dgroup.getGWorld().getLocLobby() == null) {
DGroup dGroup = new DGroup(player, plugin.getMainConfig().getTutorialDungeon(), false);
} else {
new DPlayer(player, dgroup.getGWorld().getWorld(), dgroup.getGWorld().getLocLobby(), false);
if (dGroup.getGameWorld() == null) {
dGroup.setGameWorld(GameWorld.load(DGroup.get(player).getMapName()));
dGroup.getGameWorld().setTutorial(true);
}
} else {
if (dGroup.getGameWorld() == null) {
MessageUtil.sendMessage(player, plugin.getDMessages().get("Error_TutorialNotExist"));
continue;
}
}
}
}
if (dGroup.getGameWorld().getLocLobby() != null) {
new DPlayer(player, dGroup.getGameWorld().getWorld(), dGroup.getGameWorld().getLocLobby(), false);
}
}
}
// Deny Player Cmds
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerCommand(PlayerCommandPreprocessEvent event) {
if (event.getPlayer().hasPermission("dungeonsxl.cmd")) {
public void onCommand(PlayerCommandPreprocessEvent event) {
if (event.getPlayer().hasPermission("dxl.bypass")) {
return;
}
DPlayer dplayer = DPlayer.get(event.getPlayer());
if (dplayer != null) {
if (dplayer.isEditing() && event.getPlayer().hasPermission("dungeonsxl.cmdedit") || event.getPlayer().isOp()) {
DPlayer dPlayer = DPlayer.get(event.getPlayer());
if (dPlayer == null) {
return;
}
if (dPlayer.isEditing() && event.getPlayer().hasPermission("dxl.cmdedit")) {
return;
}
@ -458,7 +493,6 @@ public class PlayerListener implements Listener {
event.setCancelled(true);
}
}
}
// Inventory Events
@EventHandler(priority = EventPriority.HIGH)
@ -469,9 +503,16 @@ public class PlayerListener implements Listener {
@EventHandler
public void onInventoryClose(InventoryCloseEvent event) {
Player player = (Player) event.getPlayer();
for (DLootInventory inventory : plugin.getDLootInventories()) {
if (event.getView() == inventory.getInventoryView()) {
if (System.currentTimeMillis() - inventory.getTime() > 500) {
if (event.getView() != inventory.getInventoryView()) {
continue;
}
if (System.currentTimeMillis() - inventory.getTime() <= 500) {
continue;
}
for (ItemStack istack : inventory.getInventory().getContents()) {
if (istack != null) {
player.getWorld().dropItem(player.getLocation(), istack);
@ -481,17 +522,21 @@ public class PlayerListener implements Listener {
plugin.getDLootInventories().remove(inventory);
}
}
}
}
// Player move
@EventHandler
public void onPlayerMove(PlayerMoveEvent event) {
public void onMove(PlayerMoveEvent event) {
Player player = event.getPlayer();
DLootInventory inventory = DLootInventory.get(player);
if (inventory != null) {
if (player.getLocation().getBlock().getType() != Material.PORTAL) {
if (inventory == null) {
return;
}
if (player.getLocation().getBlock().getType() == Material.PORTAL) {
return;
}
if (player.getLocation().getBlock().getRelative(0, 1, 0).getType() != Material.PORTAL && player.getLocation().getBlock().getRelative(0, -1, 0).getType() != Material.PORTAL
&& player.getLocation().getBlock().getRelative(1, 0, 0).getType() != Material.PORTAL && player.getLocation().getBlock().getRelative( -1, 0, 0).getType() != Material.PORTAL
&& player.getLocation().getBlock().getRelative(0, 0, 1).getType() != Material.PORTAL && player.getLocation().getBlock().getRelative(0, 0, -1).getType() != Material.PORTAL) {
@ -499,8 +544,6 @@ public class PlayerListener implements Listener {
inventory.setTime(System.currentTimeMillis());
}
}
}
}
// Etc. ---------------------------------
@ -519,17 +562,20 @@ public class PlayerListener implements Listener {
MiscUtil.secureTeleport(player, location);
}
DPlayer dplayer = DPlayer.get(player);
DPlayer dPlayer = DPlayer.get(player);
if (dPlayer == null) {
return;
}
if (dplayer != null) {
// Respawn Items
if (dplayer.getRespawnInventory() != null || dplayer.getRespawnArmor() != null) {
player.getInventory().setContents(dplayer.getRespawnInventory());
player.getInventory().setArmorContents(dplayer.getRespawnArmor());
dplayer.setRespawnInventory(null);
dplayer.setRespawnArmor(null);
}
if (dPlayer.getRespawnInventory() != null || dPlayer.getRespawnArmor() != null) {
player.getInventory().setContents(dPlayer.getRespawnInventory());
player.getInventory().setArmorContents(dPlayer.getRespawnArmor());
dPlayer.setRespawnInventory(null);
dPlayer.setRespawnArmor(null);
}
}
}
}

8
src/io/github/dre2n/dungeonsxl/player/DGroup.java
View File

@ -33,7 +33,9 @@ public class DGroup {
if (multiFloor) {
this.dungeonName = identifier;
this.mapName = plugin.getDungeons().getDungeon(dungeonName).getConfig().getStartFloor();
System.out.println("This one?");
this.unplayedFloors = plugin.getDungeons().getDungeon(dungeonName).getConfig().getFloors();
System.out.println("If this shows p,");
} else {
this.mapName = identifier;
@ -87,7 +89,7 @@ public class DGroup {
/**
* @return the gameWorld
*/
public GameWorld getGWorld() {
public GameWorld getGameWorld() {
return gameWorld;
}
@ -95,7 +97,7 @@ public class DGroup {
* @param gameWorld
* the gameWorld to set
*/
public void setGWorld(GameWorld gameWorld) {
public void setGameWorld(GameWorld gameWorld) {
this.gameWorld = gameWorld;
}
@ -256,7 +258,7 @@ public class DGroup {
public static DGroup get(GameWorld gameWorld) {
for (DGroup dGroup : plugin.getDGroups()) {
if (dGroup.getGWorld() == gameWorld) {
if (dGroup.getGameWorld() == gameWorld) {
return dGroup;
}
}

10
src/io/github/dre2n/dungeonsxl/player/DPlayer.java
View File

@ -232,7 +232,7 @@ public class DPlayer {
public void respawn() {
DGroup dGroup = DGroup.get(getPlayer());
if (checkpoint == null) {
MiscUtil.secureTeleport(getPlayer(), dGroup.getGWorld().getLocStart());
MiscUtil.secureTeleport(getPlayer(), dGroup.getGameWorld().getLocStart());
} else {
MiscUtil.secureTeleport(getPlayer(), checkpoint);
}
@ -305,10 +305,10 @@ public class DPlayer {
}
dGroup.removeUnplayedFloor(dGroup.getMapName());
dGroup.setMapName(newFloor);
dGroup.setGWorld(GameWorld.load(newFloor));
dGroup.setGameWorld(GameWorld.load(newFloor));
for (Player player : dGroup.getPlayers()) {
DPlayer dPlayer = get(player);
dPlayer.checkpoint = dGroup.getGWorld().getLocStart();
dPlayer.checkpoint = dGroup.getGameWorld().getLocStart();
}
dGroup.startGame();
}
@ -816,9 +816,9 @@ public class DPlayer {
if (gameWorld != null) {
DGroup dGroup = DGroup.get(dplayer.getPlayer());
if (dplayer.checkpoint == null) {
MiscUtil.secureTeleport(dplayer.getPlayer(), dGroup.getGWorld().getLocStart());
MiscUtil.secureTeleport(dplayer.getPlayer(), dGroup.getGameWorld().getLocStart());
if (dplayer.wolf != null) {
dplayer.wolf.teleport(dGroup.getGWorld().getLocStart());
dplayer.wolf.teleport(dGroup.getGameWorld().getLocStart());
}
} else {
MiscUtil.secureTeleport(dplayer.getPlayer(), dplayer.checkpoint);