From 539bd42f40b6a65791447a6df27c562d45fb2fab Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Tue, 28 Jul 2015 23:17:39 +0200 Subject: [PATCH] Fix portal bug --- src/com/dre/dungeonsxl/DPortal.java | 15 ++++++++++++++- src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java | 1 + src/plugin.yml | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/com/dre/dungeonsxl/DPortal.java b/src/com/dre/dungeonsxl/DPortal.java index 53ef9b01..a65936f1 100644 --- a/src/com/dre/dungeonsxl/DPortal.java +++ b/src/com/dre/dungeonsxl/DPortal.java @@ -85,10 +85,23 @@ public class DPortal { if (dgroup.getGworld() == null) { dgroup.setGworld(GameWorld.load(DGroup.get(player).getDungeonname())); } - p.msg(player, p.language.get("Error_DungeonNotExist", DGroup.get(player).getDungeonname())); + + if (dgroup.getGworld() != null) { + + if (dgroup.getGworld().locLobby == null) { + new DPlayer(player, dgroup.getGworld().world, dgroup.getGworld().world.getSpawnLocation(), false); + } else { + new DPlayer(player, dgroup.getGworld().world, dgroup.getGworld().locLobby, false); + } + + } else { + p.msg(player, p.language.get("Error_DungeonNotExist", DGroup.get(player).getDungeonname())); + } + } else { p.msg(player, p.language.get("Error_NotInGroup")); } + } public void delete() { diff --git a/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java b/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java index 6ba83b9e..60762871 100644 --- a/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java +++ b/src/com/dre/dungeonsxl/signs/SIGNSoundMsg.java @@ -16,6 +16,7 @@ public class SIGNSoundMsg extends DSign { // Variables private boolean initialized; + @SuppressWarnings("unused") private String msg; private CopyOnWriteArrayList done = new CopyOnWriteArrayList(); diff --git a/src/plugin.yml b/src/plugin.yml index 766304d5..26e23650 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -1,6 +1,6 @@ name: DungeonsXL main: com.dre.dungeonsxl.P -version: 0.9.4-SNAPSHOT +version: 0.9.4 author: Frank Baumann authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel] website: http://www.dre2n.ml