From e808a9fb5107e8586b20c3d15e2b24d6b913db49 Mon Sep 17 00:00:00 2001
From: Grafe <flingelfrank@hotmail.com>
Date: Mon, 21 Jan 2013 00:34:15 +0100
Subject: [PATCH] Removed ability to test dungeon in editmode

---
 src/com/dre/dungeonsxl/DPlayer.java          | 72 +++++++++-----------
 src/com/dre/dungeonsxl/commands/CMDTest.java | 28 +-------
 2 files changed, 34 insertions(+), 66 deletions(-)

diff --git a/src/com/dre/dungeonsxl/DPlayer.java b/src/com/dre/dungeonsxl/DPlayer.java
index 54bf04d2..54f3d79f 100644
--- a/src/com/dre/dungeonsxl/DPlayer.java
+++ b/src/com/dre/dungeonsxl/DPlayer.java
@@ -9,6 +9,7 @@ import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.configuration.Configuration;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.entity.EntityType;
@@ -31,8 +32,7 @@ public class DPlayer {
 	public Player player;
 	public World world;
 
-	public DPlayer oldDPlayer=null;
-	public int isinTestMode=0;
+	public boolean isinTestMode=false;
 
 	public Location oldLocation;
 	public ItemStack[] oldInventory;
@@ -114,10 +114,6 @@ public class DPlayer {
 	public void leave(){
 		remove(this);
 
-		if(this.oldDPlayer!=null){
-			this.oldDPlayer.isinTestMode=0;
-		}
-
 		this.player.teleport(this.oldLocation);
 		this.player.getInventory().setContents(this.oldInventory);
 		this.player.getInventory().setArmorContents(this.oldArmor);
@@ -144,7 +140,7 @@ public class DPlayer {
 			}
 
 			//Belohnung
-			if(this.oldDPlayer==null&&this.isinTestMode!=2){//Nur wenn man nicht am Testen ist
+			if(!this.isinTestMode){//Nur wenn man nicht am Testen ist
 				if(isFinished){
 					this.addTreasure();
 
@@ -439,44 +435,42 @@ public class DPlayer {
 		for(DPlayer dplayer:players){
 			if(!updateSecond){
 				//Check in World
-				if(dplayer.isinTestMode!=1){
-					if(!dplayer.player.getWorld().equals(dplayer.world)){
-						if(dplayer.isEditing){
-							EditWorld eworld=EditWorld.get(dplayer.world);
-							if(eworld!=null){
-								if(eworld.lobby==null){
-									dplayer.player.teleport(eworld.world.getSpawnLocation());
-								}else{
-									dplayer.player.teleport(eworld.lobby);
-								}
+				if(!dplayer.player.getWorld().equals(dplayer.world)){
+					if(dplayer.isEditing){
+						EditWorld eworld=EditWorld.get(dplayer.world);
+						if(eworld!=null){
+							if(eworld.lobby==null){
+								dplayer.player.teleport(eworld.world.getSpawnLocation());
+							}else{
+								dplayer.player.teleport(eworld.lobby);
 							}
-						}else{
-							GameWorld gworld=GameWorld.get(dplayer.world);
+						}
+					}else{
+						GameWorld gworld=GameWorld.get(dplayer.world);
+						if(gworld!=null){
 							if(gworld!=null){
-								if(gworld!=null){
 
-									DGroup dgroup=DGroup.get(dplayer.player);
-									if(dplayer.checkpoint==null){
-										dplayer.player.teleport(dgroup.gworld.locStart);
-										if(dplayer.wolf!=null){
-											dplayer.wolf.teleport(dgroup.gworld.locStart);
-										}
-									}else{
-										dplayer.player.teleport(dplayer.checkpoint.location);
-										if(dplayer.wolf!=null){
-											dplayer.wolf.teleport(dplayer.checkpoint.location);
-										}
+								DGroup dgroup=DGroup.get(dplayer.player);
+								if(dplayer.checkpoint==null){
+									dplayer.player.teleport(dgroup.gworld.locStart);
+									if(dplayer.wolf!=null){
+										dplayer.wolf.teleport(dgroup.gworld.locStart);
 									}
-
-
-									//Respawn Items
-									for(ItemStack istack:dplayer.respawnInventory){
-										if(istack!=null){
-											dplayer.player.getInventory().addItem(istack);
-										}
+								}else{
+									dplayer.player.teleport(dplayer.checkpoint.location);
+									if(dplayer.wolf!=null){
+										dplayer.wolf.teleport(dplayer.checkpoint.location);
 									}
-									dplayer.respawnInventory.clear();
 								}
+
+
+								//Respawn Items
+								for(ItemStack istack:dplayer.respawnInventory){
+									if(istack!=null){
+										dplayer.player.getInventory().addItem(istack);
+									}
+								}
+								dplayer.respawnInventory.clear();
 							}
 						}
 					}
diff --git a/src/com/dre/dungeonsxl/commands/CMDTest.java b/src/com/dre/dungeonsxl/commands/CMDTest.java
index 77c33d60..699e7804 100644
--- a/src/com/dre/dungeonsxl/commands/CMDTest.java
+++ b/src/com/dre/dungeonsxl/commands/CMDTest.java
@@ -39,7 +39,7 @@ public class CMDTest extends DCommand {
 						}else{
 							newDPlayer=new DPlayer(player,dgroup.gworld.world,dgroup.gworld.locLobby, false);
 						}
-						newDPlayer.isinTestMode=2;
+						newDPlayer.isinTestMode=true;
 					}
 				}else{
 					p.msg(player, p.language.get("Error_DungeonNotExist",dungeonname));
@@ -47,32 +47,6 @@ public class CMDTest extends DCommand {
 			}else{
 				this.displayhelp(player);
 			}
-		}else if(dplayer.isEditing){
-
-			if(args.length>1){
-				dungeonname=args[1];
-			}else{
-				dungeonname=EditWorld.get(dplayer.world).dungeonname;
-			}
-
-			DGroup dgroup=new DGroup(player, dungeonname);
-			if(dgroup!=null){
-				if(dgroup.gworld==null){
-					dgroup.gworld=GameWorld.load(DGroup.get(player).dungeonname);
-				}
-
-				DPlayer newDPlayer;
-
-				if(dgroup.gworld.locLobby==null){
-					newDPlayer=new DPlayer(player,dgroup.gworld.world,dgroup.gworld.world.getSpawnLocation(), false);
-				}else{
-					newDPlayer=new DPlayer(player,dgroup.gworld.world,dgroup.gworld.locLobby, false);
-				}
-
-				newDPlayer.oldDPlayer=dplayer;
-				dplayer.isinTestMode=1;
-			}
-
 		}else{
 			p.msg(player, p.language.get("Error_LeaveDungeon"));
 		}