Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2025-02-17 21:02:12 +01:00
Code Issues Projects Releases Wiki Activity

Fix announcers

Browse Source
This commit is contained in:
Daniel Saukel 2016-06-09 23:27:29 +02:00
parent ad9e9b0077
commit 1851be10cb
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,6 +310,25 @@ public class DGroup {
this.dungeon = dungeon;
}
/**
* Sets up all dungeon-related fields.
*
* @param name
* the name of the dungeon
*/
public void setDungeon(String name) {
dungeon = plugin.getDungeons().getDungeon(name);
if (dungeon != null) {
dungeonName = dungeon.getName();
mapName = dungeon.getConfig().getStartFloor();
unplayedFloors = dungeon.getConfig().getFloors();
} else {
mapName = name;
dungeon = new Dungeon(name);
}
}
/**
* @return the dungeonName
*/

18
src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java
View File

@ -39,6 +39,9 @@ public class AnnouncerStartGameTask extends BukkitRunnable {
HashSet<Player> players = new HashSet<>();
for (DGroup dGroup : announcer.getDGroups()) {
if (dGroup == null) {
continue;
}
for (Player player : dGroup.getPlayers()) {
players.add(player);
}
@ -56,10 +59,21 @@ public class AnnouncerStartGameTask extends BukkitRunnable {
@Override
public void run() {
Game game = new Game(announcer.getDGroups().get(0), announcer.getMapName());
Game game = null;
for (DGroup dGroup : announcer.getDGroups()) {
game.getDGroups().set(announcer.getDGroups().indexOf(dGroup), dGroup);
if (dGroup == null) {
continue;
}
if (game == null) {
game = new Game(dGroup, announcer.getMapName());
} else {
game.getDGroups().add(dGroup);
}
dGroup.setDungeon(announcer.getDungeonName() == null ? announcer.getMapName() : announcer.getDungeonName());
dGroup.setGameWorld(game.getWorld());
}
for (Player player : game.getPlayers()) {