Olympiad

Index: aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/AbstractOlympiadGame.java
===================================================================
--- aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/AbstractOlympiadGame.java	(revision 617)
+++ aCis_gameserver/java/net/sf/l2j/gameserver/model/olympiad/AbstractOlympiadGame.java	(revision 636)
@@ -19,6 +19,7 @@
 import java.util.logging.Logger;

 import net.sf.l2j.gameserver.ai.CtrlIntention;
-import net.sf.l2j.gameserver.datatables.MapRegionTable;
 import net.sf.l2j.gameserver.datatables.SkillTable;
 import net.sf.l2j.gameserver.model.L2Party;
 import net.sf.l2j.gameserver.model.L2Party.MessageType;
@@ -30,6 +31,7 @@
 import net.sf.l2j.gameserver.model.actor.instance.L2PetInstance;
 import net.sf.l2j.gameserver.model.item.instance.ItemInstance;
 import net.sf.l2j.gameserver.model.zone.type.L2OlympiadStadiumZone;
-import net.sf.l2j.gameserver.model.zone.type.L2TownZone;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ExOlympiadMode;
 import net.sf.l2j.gameserver.network.serverpackets.InventoryUpdate;

@@ -359,12 +358,16 @@
 		if (player == null)
 			return;

+		final Location loc = player.getSavedLocation();
-		Location loc = player.getSavedLocation();
 		if (loc.equals(Location.DUMMY_LOC))
 			return;

-		final L2TownZone town = MapRegionTable.getTown(loc.getX(), loc.getY(), loc.getZ());
-		if (town != null)
-			loc = town.getSpawnLoc();
-
 		player.teleToLocation(loc, 0);
+		player.getSavedLocation().set(player.getX(), player.getY(), player.getZ());
-		player.getSavedLocation().clean();
 	}

 	public static final void rewardParticipant(L2PcInstance player, int[][] reward)