Changeset 1514

(2010/03/14 12:30) Almost 2 years ago

Instances refactoring. Players should be able to rejoin group instance. Relog should place player in the same instance or move to instance's entry point (same for ascension quest). Added Fire Temple instance support (Morheim entry only)

Affected files

trunk/AE-go_GameServer/config/main/periodicsave.properties Download diff

 # ----------------------------
 #
 # WARNING:
-# Saving of player data for one player could upto 1sec
+# With 500 player online saving can be upto 10 seconds
-# with 500 player online it can be upto 10 minutes
+# (it depends on hardware, changes in item locations, new acquisitions etc)
-# (it depends on changes in item locations, new acquisitions etc)
 # Generally accepted inteval is 15-20 minutes
 # Time in seconds for saving player data (player, abyss rank, quests, skills)

trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_1006Ascension.java Download diff

 import com.aionemu.gameserver.questEngine.model.QuestEnv;
 import com.aionemu.gameserver.questEngine.model.QuestState;
 import com.aionemu.gameserver.questEngine.model.QuestStatus;
+import com.aionemu.gameserver.services.InstanceService;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.services.TeleportService;
 import com.aionemu.gameserver.services.ZoneService;
 	@Inject
 	TeleportService teleportService;
 	@Inject
+	InstanceService instanceService;
+	@Inject
 	World world;
 	public _1006Ascension()
 							qs.setQuestVar(99);
 							updateQuestStatus(player, qs);
 							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
-							WorldMapInstance newInstance = player.getPosition().getWorld().getNextAvailableInstance(310010000);
+							WorldMapInstance newInstance = instanceService.getNextAvailableInstance(310010000, 60 * 20);
-							newInstance.setDestroyTime(60 * 20);
+							instanceService.registerPlayerWithInstance(newInstance, player);
 							teleportService.teleportTo(player, 310010000, newInstance.getInstanceId(), 52, 174, 229, 0);
 							return true;
 						}
 			int var = qs.getQuestVars().getQuestVars();
 			if(var == 4 || (var >= 50 && var <= 55) || var == 99)
 			{
-				int instanceId = player.getInstanceId();
+				if(player.getWorldId() != 310010000)
-				WorldMap worldMap = world.getWorldMap(310010000);
-				int id = -1;
-				if (worldMap != null)
-					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
-				if(id == -1 || player.getWorldId() != 310010000)
 				{
 					qs.setQuestVar(3);
 					updateQuestStatus(player, qs);
 					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
-					teleportService.teleportTo(player, 210010000, 1, 244f, 1639f, 100.5f, 1000);
 				}
-				else if(id != instanceId)
-					teleportService.changeChannel(player, id-1);
 			}
 		}
 		return false;

trunk/AE-go_GameServer/data/scripts/system/handlers/quest/ascension/_2008Ascension.java Download diff

 import com.aionemu.gameserver.questEngine.model.QuestEnv;
 import com.aionemu.gameserver.questEngine.model.QuestState;
 import com.aionemu.gameserver.questEngine.model.QuestStatus;
+import com.aionemu.gameserver.services.InstanceService;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.services.TeleportService;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 	TeleportService	teleportService;
 	@Inject
 	ItemService itemService;
+	@Inject
+	InstanceService instanceService;
 	public _2008Ascension()
 	{
 							updateQuestStatus(player, qs);
 							PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(), 0));
 							// Create instance
-							WorldMapInstance newInstance = player.getPosition().getWorld().getNextAvailableInstance(320010000);
+							WorldMapInstance newInstance = instanceService.getNextAvailableInstance(320010000, 60 * 20);
-							newInstance.setDestroyTime(60 * 20); // 20 min
+							instanceService.registerPlayerWithInstance(newInstance, player);
 							teleportService.teleportTo(player, 320010000, newInstance.getInstanceId(), 457.65f, 426.8f, 230.4f, 0);
 							return true;
 						}
 	public boolean onEnterWorldEvent(QuestEnv env)
 	{
 		Player player = env.getPlayer();
-		int instanceId = player.getInstanceId();
 		QuestState qs = player.getQuestStateList().getQuestState(questId);
 		if(qs != null && qs.getStatus() == QuestStatus.START)
 		{
 			int var = qs.getQuestVars().getQuestVars();
 			if(var == 5 || (var >= 50 && var <= 55) || var == 99)
 			{
-				WorldMap worldMap = world.getWorldMap(320010000);
+				if(player.getWorldId() != 320010000)
-				int id = -1;
-				if (worldMap != null)
-					id = worldMap.getWorldMapScriptInstanceIdByPlyerObjId(player.getObjectId());
-				if(id == -1 || player.getWorldId() != 320010000)
 				{
 					qs.setQuestVar(4);
 					updateQuestStatus(player, qs);
 					PacketSendUtility.sendPacket(player, new SM_SYSTEM_MESSAGE(SystemMessageId.QUEST_FAILED_$1, DataManager.QUEST_DATA.getQuestById(questId).getName()));
-					teleportService.teleportTo(player, 220010000, 1, 378.9f, 1895.39f, 330.0f, 1000);
 				}
-				else if(id != instanceId)
-					teleportService.changeChannel(player, id-1);
 			}
 		}
 		return false;

trunk/AE-go_GameServer/data/scripts/system/handlers/quest/poeta/_1002RequestoftheElim.java Download diff

 import com.aionemu.gameserver.questEngine.model.QuestEnv;
 import com.aionemu.gameserver.questEngine.model.QuestState;
 import com.aionemu.gameserver.questEngine.model.QuestStatus;
+import com.aionemu.gameserver.services.InstanceService;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.services.TeleportService;
 import com.aionemu.gameserver.utils.PacketSendUtility;
 public class _1002RequestoftheElim extends QuestHandler
 {
 	@Inject
+	InstanceService instanceService;
+	@Inject
 	TeleportService teleportService;
 	@Inject
 	ItemService itemService;
 						updateQuestStatus(player, qs);
 						PacketSendUtility.sendPacket(player, new SM_DIALOG_WINDOW(env.getVisibleObject().getObjectId(),
 							0));
-						WorldMapInstance newInstance = player.getPosition().getWorld().getNextAvailableInstance(310010000);
+						WorldMapInstance newInstance = instanceService.getNextAvailableInstance(310010000, 60 * 5);
-						newInstance.setDestroyTime(60 * 5);
 						teleportService.teleportTo(player, 310010000, newInstance.getInstanceId(), 52, 174, 229, 0);
 						return true;
 					}

trunk/AE-go_GameServer/data/static_data/portals/portal_templates.xml Download diff

	1513		1514
1	<portal_templates>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<portal npcid="700414" mapid="300030000" x="600" y="700" z="327.165" instance="true" minlevel="25" maxlevel="28" group="true"/>	2	<portal_templates xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
		3	xsi:noNamespaceSchemaLocation="portal_template.xsd">
		4
		5	<!-- Nochsana Training Camp -->
		6	<portal npcid="700414" instance="true" minlevel="25" maxlevel="28" group="true" race="ASMODIANS">
		7	<entrypoint mapid="400010000" x="876.7211" y="3079.2874" z="1644.5786"/>
		8	<exitpoint mapid="300030000" x="600" y="700" z="327.165"/>
		9	</portal>
		10
		11	<!-- Fire Temple -->
		12	<portal npcid="730047" instance="true" minlevel="25" maxlevel="50" group="true">
		13	<entrypoint mapid="220020000" x="1592.178" y="977.2572" z="140.75"/>
		14	<exitpoint mapid="320100000" x="148.256" y="460.857" z="141.713"/>
		15	</portal>
		16
		17	<!-- Pernos [Ascension quest]-->
		18	<portal npcid="790001" instance="true">
		19	<entrypoint mapid="210010000" x="241.094" y="1639.461" z="100.38"/>
		20	<exitpoint mapid="310010000" x="52" y="174" z="229"/>
		21	</portal>
		22
		23	<!-- Munin [Ascension quest]-->
		24	<portal npcid="203550" instance="true">
		25	<entrypoint mapid="220010000" x="378.9" y="1895.39" z="330.0"/>
		26	<exitpoint mapid="310010000" x="52" y="174" z="229"/>
		27	</portal>
		28
3	</portal_templates>	29	</portal_templates>

trunk/AE-go_GameServer/data/static_data/portals/portal_templates.xsd Download diff

 <xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	<xs:include schemaLocation="../import.xsd" />
+	<xs:include schemaLocation="../global_types.xsd" />
 	<xs:element name="portal_templates">
 		<xs:complexType>
 	</xs:element>
 	<xs:complexType name="Portal">
+		<xs:sequence>
+			<xs:element name="entrypoint" type="EntryPoint" minOccurs="1" maxOccurs="1"/>
+			<xs:element name="exitpoint" type="ExitPoint" minOccurs="1" maxOccurs="1"/>
+		</xs:sequence>
+		<xs:attribute name="race" type="Race" />
 		<xs:attribute name="group" type="xs:boolean" />
 		<xs:attribute name="maxlevel" type="xs:int" />
 		<xs:attribute name="minlevel" type="xs:int" />
 		<xs:attribute name="instance" type="xs:boolean" />
+		<xs:attribute name="npcid" type="xs:int" />
+	</xs:complexType>
+	<xs:complexType name="EntryPoint">
+		<xs:attribute name="mapid" type="xs:int" />
+		<xs:attribute name="x" type="xs:float" />
+		<xs:attribute name="y" type="xs:float" />
 		<xs:attribute name="z" type="xs:float" />
+	</xs:complexType>
+	<xs:complexType name="ExitPoint">
+		<xs:attribute name="mapid" type="xs:int" />
+		<xs:attribute name="x" type="xs:float" />
 		<xs:attribute name="y" type="xs:float" />
-		<xs:attribute name="x" type="xs:float" />
+		<xs:attribute name="z" type="xs:float" />
-		<xs:attribute name="mapid" type="xs:int" />
-		<xs:attribute name="npcid" type="xs:int" />
 	</xs:complexType>
 </xs:schema>

trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/PortalController.java Download diff

	1513		1514
24	import com.aionemu.gameserver.model.gameobjects.Creature;	24	import com.aionemu.gameserver.model.gameobjects.Creature;
25	import com.aionemu.gameserver.model.gameobjects.player.Player;	25	import com.aionemu.gameserver.model.gameobjects.player.Player;
26	import com.aionemu.gameserver.model.group.PlayerGroup;	26	import com.aionemu.gameserver.model.group.PlayerGroup;
		27	import com.aionemu.gameserver.model.templates.portal.ExitPoint;
27	import com.aionemu.gameserver.model.templates.portal.PortalTemplate;	28	import com.aionemu.gameserver.model.templates.portal.PortalTemplate;
28	import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION;	29	import com.aionemu.gameserver.network.aion.serverpackets.SM_EMOTION;
29	import com.aionemu.gameserver.network.aion.serverpackets.SM_USE_OBJECT;	30	import com.aionemu.gameserver.network.aion.serverpackets.SM_USE_OBJECT;
		31	import com.aionemu.gameserver.services.InstanceService;
30	import com.aionemu.gameserver.utils.PacketSendUtility;	32	import com.aionemu.gameserver.utils.PacketSendUtility;
31	import com.aionemu.gameserver.utils.ThreadPoolManager;	33	import com.aionemu.gameserver.utils.ThreadPoolManager;
32	import com.aionemu.gameserver.world.WorldMapInstance;	34	import com.aionemu.gameserver.world.WorldMapInstance;
...		...
34		36
35	/**	37	/**
36	* @author ATracer	38	* @author ATracer
37	*	39	*
38	*/	40	*/
39	public class PortalController extends NpcController	41	public class PortalController extends NpcController
40	{	42	{
41	@Inject	43	@Inject
42	private PortalData portalData;	44	private PortalData portalData;
43		45	@Inject
44	private PortalTemplate portalTemplate;	46	private InstanceService instanceService;
45		47
		48	private PortalTemplate portalTemplate;
		49
46	@Override	50	@Override
47	public void setOwner(Creature owner)	51	public void setOwner(Creature owner)
48	{	52	{
...		...
50	portalTemplate = portalData.getPortalTemplate(owner.getObjectTemplate().getTemplateId());	54	portalTemplate = portalData.getPortalTemplate(owner.getObjectTemplate().getTemplateId());
51	}	55	}
52		56
53
54
55	@Override	57	@Override
56	public void onDialogRequest(Player player)	58	public void onDialogRequest(final Player player)
57	{	59	{
58	if(portalTemplate == null)	60	if(portalTemplate == null)
59	return;	61	return;
60
61	if(portalTemplate.isInstance() && CustomConfig.ENABLE_INSTANCES)
62	portGroup(player);
63	else
64	port(player);
65	}
66		62
		63	if(!CustomConfig.ENABLE_INSTANCES)
		64	return;
67		65
		66	final int defaultUseTime = 3000;
		67	PacketSendUtility.sendPacket(player, new SM_USE_OBJECT(player.getObjectId(), getOwner().getObjectId(),
		68	defaultUseTime, 1));
		69	PacketSendUtility.broadcastPacket(player, new SM_EMOTION(player, 37, 0, getOwner().getObjectId()), true);
68		70
		71	ThreadPoolManager.getInstance().schedule(new Runnable(){
		72	@Override
		73	public void run()
		74	{
		75	PacketSendUtility.sendPacket(player, new SM_USE_OBJECT(player.getObjectId(), getOwner().getObjectId(),
		76	defaultUseTime, 0));
		77
		78	analyzePortation(player);
		79	}
		80
		81	/**
		82	* @param player
		83	*/
		84	private void analyzePortation(final Player player)
		85	{
		86	PlayerGroup group = player.getPlayerGroup();
		87
		88	if(portalTemplate.isGroup() && group != null)
		89	{
		90	WorldMapInstance instance = instanceService.getRegisteredInstance(portalTemplate.getExitPoint()
		91	.getMapId(), group.getGroupId());
		92	// if already registered - just teleport
		93	if(instance != null)
		94	{
		95	transfer(player, instance);
		96	return;
		97	}
		98
		99	portGroup(player);
		100	}
		101	else if(!portalTemplate.isGroup())
		102	{
		103	WorldMapInstance instance = instanceService.getRegisteredInstance(portalTemplate.getExitPoint()
		104	.getMapId(), player.getObjectId());
		105	// if already registered - just teleport
		106	if(instance != null)
		107	{
		108	transfer(player, instance);
		109	return;
		110	}
		111	port(player);
		112	}
		113	}
		114	}, defaultUseTime);
		115
		116	}
		117
69	/**	118	/**
70	* @param player	119	* @param player
71	*/	120	*/
72	private void port(Player player)	121	private void port(Player requester)
73	{	122	{
74	Collection<Player> players = Collections.singletonList(player);	123	Collection<Player> players = Collections.singletonList(requester);
75	if(!checkPlayersLevel(players))	124	if(!checkPlayersLevel(players))
76	return;	125	return;
77		126
78	transfer(player, players);	127	WorldMapInstance instance = instanceService.getNextAvailableInstance(portalTemplate.getExitPoint().getMapId());
		128	instanceService.registerPlayerWithInstance(instance, requester);
		129	transfer(requester, instance);
79	}	130	}
80		131
81
82	/**	132	/**
83	* @param player	133	* @param player
84	*/	134	*/
85	private void portGroup(Player player)	135	private void portGroup(Player requester)
86	{	136	{
87	PlayerGroup group = player.getPlayerGroup();	137	PlayerGroup group = requester.getPlayerGroup();
88	if(group == null \|\| group.getGroupLeader().getObjectId() != player.getObjectId())	138	if(group == null \|\| group.getGroupLeader().getObjectId() != requester.getObjectId())
		139	{
		140	PacketSendUtility.sendMessage(requester, "You are not group leader");
89	return;	141	return;
90		142	}
		143
91	Collection<Player> players = group.getMembers();	144	Collection<Player> players = group.getMembers();
92	if(!checkPlayersLevel(players))	145	if(!checkPlayersLevel(players))
93	return;	146	return;
94		147
95	transfer(player, players);	148	WorldMapInstance instance = instanceService.getNextAvailableInstance(portalTemplate.getExitPoint().getMapId());
		149	instanceService.registerGroupWithInstance(instance, group);
		150	for(Player player : players)
		151	{
		152	transfer(player, instance);
		153	}
96	}	154	}
97		155
98	/**	156	/**
99	* @param players	157	* @param players
100	*/	158	*/
101	private void transfer(final Player leader, final Collection<Player> players)	159	private void transfer(Player player, WorldMapInstance instance)
102	{	160	{
103	final int defaultUseTime = 3000;	161	ExitPoint exitPoint = portalTemplate.getExitPoint();
104	PacketSendUtility.sendPacket(leader, new SM_USE_OBJECT(leader.getObjectId(),	162	sp.getTeleportService().teleportTo(player, exitPoint.getMapId(), instance.getInstanceId(),
105	getOwner().getObjectId(), defaultUseTime, 1));	163	exitPoint.getX(), exitPoint.getY(), exitPoint.getZ(), 0);
106	PacketSendUtility.broadcastPacket(leader, new SM_EMOTION(leader, 37, 0, getOwner().getObjectId()), true);
107
108	ThreadPoolManager.getInstance().schedule(new Runnable(){
109	@Override
110	public void run()
111	{
112	PacketSendUtility.sendPacket(leader, new SM_USE_OBJECT(leader.getObjectId(),
113	getOwner().getObjectId(), defaultUseTime, 0));
114
115	WorldMapInstance newInstance = sp.getWorld().getNextAvailableInstance(portalTemplate.getMapId());
116	newInstance.setDestroyTime(60 * 30);
117
118	for(Player player : players)
119	{
120	sp.getTeleportService().teleportTo(player, portalTemplate.getMapId(), newInstance.getInstanceId(),
121	portalTemplate.getX(), portalTemplate.getY(), portalTemplate.getZ(), 0);
122	}
123	}
124	}, defaultUseTime);
125	}	164	}
126		165
127
128	/**	166	/**
129	*	167	*
130	* @param players	168	* @param players
...		...
134	{	172	{
135	int minLevel = portalTemplate.getMinLevel();	173	int minLevel = portalTemplate.getMinLevel();
136	int maxLevel = portalTemplate.getMaxLevel();	174	int maxLevel = portalTemplate.getMaxLevel();
137		175
138	for(Player player : players)	176	for(Player player : players)
139	{	177	{
140	int playerLevel = player.getLevel();	178	int playerLevel = player.getLevel();
...		...
143	}	181	}
144	return true;	182	return true;
145	}	183	}
146		184
147
148	}	185	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/dataholders/PortalData.java Download diff

 	/** A map containing all npc templates */
 	private TIntObjectHashMap<PortalTemplate> portalData	= new TIntObjectHashMap<PortalTemplate>();
+	private TIntObjectHashMap<PortalTemplate> worldIdPortalMap	= new TIntObjectHashMap<PortalTemplate>();
 	void afterUnmarshal(Unmarshaller u, Object parent)
 	{
 		for(PortalTemplate portal : portals)
 		{
 			portalData.put(portal.getNpcId(), portal);
+			worldIdPortalMap.put(portal.getExitPoint().getMapId(), portal);
 		}
 		portals = null;
 	}
 		return portalData.size();
 	}
-	public PortalTemplate getPortalTemplate(int id)
+	/**
+	 *
+	 * @param npcId
+	 * @return
+	 */
+	public PortalTemplate getPortalTemplate(int npcId)
 	{
-		return portalData.get(id);
+		return portalData.get(npcId);
 	}
+	/**
+	 *
+	 * @param worldId
+	 * @return
+	 */
+	public PortalTemplate getPortalTemplateByMap(int worldId)
+	{
+		return worldIdPortalMap.get(worldId);
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/dataholders/WorldMapsData.java Download diff

	1513		1514
16	*/	16	*/
17	package com.aionemu.gameserver.dataholders;	17	package com.aionemu.gameserver.dataholders;
18		18
		19	import gnu.trove.TIntObjectHashMap;
		20
19	import java.util.Iterator;	21	import java.util.Iterator;
20	import java.util.List;	22	import java.util.List;
21		23
		24	import javax.xml.bind.Unmarshaller;
22	import javax.xml.bind.annotation.XmlAccessType;	25	import javax.xml.bind.annotation.XmlAccessType;
23	import javax.xml.bind.annotation.XmlAccessorType;	26	import javax.xml.bind.annotation.XmlAccessorType;
24	import javax.xml.bind.annotation.XmlElement;	27	import javax.xml.bind.annotation.XmlElement;
...		...
40	{	43	{
41	@XmlElement(name = "map")	44	@XmlElement(name = "map")
42	private List<WorldMapTemplate> worldMaps;	45	private List<WorldMapTemplate> worldMaps;
		46
		47	private TIntObjectHashMap<WorldMapTemplate> worldIdMap = new TIntObjectHashMap<WorldMapTemplate>();
		48
		49	void afterUnmarshal(Unmarshaller u, Object parent)
		50	{
		51	for(WorldMapTemplate map : worldMaps)
		52	{
		53	worldIdMap.put(map.getMapId(), map);
		54	}
		55	}
43		56
44	/**	57	/**
45	* {@inheritDoc}	58	* {@inheritDoc}
...		...
59	{	72	{
60	return worldMaps == null ? 0 : worldMaps.size();	73	return worldMaps == null ? 0 : worldMaps.size();
61	}	74	}
		75
		76	/**
		77	*
		78	* @param worldId
		79	* @return
		80	*/
		81	public WorldMapTemplate getTemplate(int worldId)
		82	{
		83	return worldIdMap.get(worldId);
		84	}
62	}	85	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/templates/portal/EntryPoint.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/templates/portal/ExitPoint.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/model/templates/portal/PortalTemplate.java Download diff

 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
+import com.aionemu.gameserver.model.Race;
 /**
  * @author ATracer
  *
 {
 	@XmlAttribute(name = "npcid")
 	protected int	npcId;
-	@XmlAttribute(name = "mapid")
-	protected int	mapId;
-	@XmlAttribute(name = "x")
-	protected float	x;
-	@XmlAttribute(name = "y")
-	protected float	y;
-	@XmlAttribute(name = "z")
-	protected float	z;
 	@XmlAttribute(name = "instance")
 	protected boolean	instance;
 	@XmlAttribute(name = "minlevel")
 	protected int	minLevel;
 	@XmlAttribute(name = "maxlevel")
 	protected int	maxLevel;
-	@XmlAttribute(name = "item_id")
+	@XmlAttribute(name = "group")
 	protected boolean	group;
+	@XmlAttribute(name = "race")
+	protected Race race;
+	@XmlElement(name = "entrypoint")
+	protected EntryPoint	entryPoint;
+	@XmlElement(name = "exitpoint")
+	protected ExitPoint	exitPoint;
 	/**
 	 * @return the npcId
 	 */
 		return npcId;
 	}
 	/**
-	 * @return the mapId
-	 */
-	public int getMapId()
-	{
-		return mapId;
-	}
-	/**
-	 * @return the x
-	 */
-	public float getX()
-	{
-		return x;
-	}
-	/**
-	 * @return the y
-	 */
-	public float getY()
-	{
-		return y;
-	}
-	/**
-	 * @return the z
-	 */
-	public float getZ()
-	{
-		return z;
-	}
-	/**
 	 * @return the instance
 	 */
 	public boolean isInstance()
 	{
 		return group;
 	}
+	/**
+	 * @return the race
+	 */
+	public Race getRace()
+	{
+		return race;
+	}
+	/**
+	 * @return the entryPoint
+	 */
+	public EntryPoint getEntryPoint()
+	{
+		return entryPoint;
+	}
+	/**
+	 * @return the exitPoint
+	 */
+	public ExitPoint getExitPoint()
+	{
+		return exitPoint;
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/network/aion/clientpackets/CM_ENTER_WORLD.java Download diff

	1513		1514
124	if(player != null && client.setActivePlayer(player))	124	if(player != null && client.setActivePlayer(player))
125	{	125	{
126	player.setClientConnection(client);	126	player.setClientConnection(client);
127	player.getController().startProtectionActiveTask();
128	/*	127	/*
129	* Store player into World.	128	* Store player into World.
130	*/	129	*/
...		...
188	}	187	}
189		188
190	client.sendPacket(new SM_INVENTORY_INFO());	189	client.sendPacket(new SM_INVENTORY_INFO());
191	client.sendPacket(new SM_CHANNEL_INFO(player.getPosition())); // ?? unknwon	190
		191	playerService.playerLoggedIn(player);
		192
192	// sendPacket(new SM_UNKD3());	193	// sendPacket(new SM_UNKD3());
193		194
194	/*	195	/*
195	* Needed	196	* Needed
196	*/	197	*/
		198
197	client.sendPacket(new SM_STATS_INFO(player));	199	client.sendPacket(new SM_STATS_INFO(player));
198	sendPacket(new SM_CUBE_UPDATE(player, 6));	200	sendPacket(new SM_CUBE_UPDATE(player, 6));
199		201
...		...
206	player.getController().updateNearbyQuests();	208	player.getController().updateNearbyQuests();
207		209
208	sendPacket(new SM_TITLE_LIST(player));	210	sendPacket(new SM_TITLE_LIST(player));
209		211
		212	client.sendPacket(new SM_CHANNEL_INFO(player.getPosition()));
210	/**	213	/**
211	* Player's accumulated time; params are: - 0h 12m - play time (1st and 2nd string-params) - 1h 26m - rest	214	* Player's accumulated time; params are: - 0h 12m - play time (1st and 2nd string-params) - 1h 26m - rest
212	* time (3rd and 4th string-params)	215	* time (3rd and 4th string-params)
...		...
237	if(player.isLegionMember())	240	if(player.isLegionMember())
238	legionService.legionMemberOnLogin(player);	241	legionService.legionMemberOnLogin(player);
239		242
240	playerService.playerLoggedIn(player);
241
242	if(player.isInGroup())	243	if(player.isInGroup())
243	groupService.groupMemberOnLogin(player);	244	groupService.groupMemberOnLogin(player);
244		245

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/InstanceService.java

Show contents

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/PlayerService.java Download diff

 	private ItemService					itemService;
 	private LegionService				legionService;
 	private TeleportService				teleportService;
-	private PlayerControllerFactory			controllerFactory;
+	private PlayerControllerFactory		controllerFactory;
 	private SkillLearnService			skillLearnService;
 	private GroupService				groupService;
 	private PunishmentService			punishmentService;
 	private DuelService					duelService;
 	private PlayerStatsData				playerStatsData;
 	private PlayerInitialData			playerInitialData;
+	private InstanceService				instanceService;
 	@Inject
 	public PlayerService(World world, ItemService itemService,
 		LegionService legionService, TeleportService teleportService, PlayerControllerFactory controllerFactory,
 		SkillLearnService skillLearnService, GroupService groupService, PunishmentService punishmentService,
-		DuelService duelService, PlayerStatsData playerStatsData, PlayerInitialData playerInitialData)
+		DuelService duelService, PlayerStatsData playerStatsData, PlayerInitialData playerInitialData,
+		InstanceService instanceService)
 	{
 		this.world = world;
 		this.itemService = itemService;
 		this.duelService = duelService;
 		this.playerStatsData = playerStatsData;
 		this.playerInitialData = playerInitialData;
+		this.instanceService = instanceService;
 	}
 	/**
 		{
 			TitleChangeListener.onTitleChange(player.getGameStats(), player.getCommonData().getTitleId(), true);
 		}
+		//analyze current instance
+		instanceService.onPlayerLogin(player);
 		if(CacheConfig.CACHE_PLAYERS)
 			playerCache.put(playerObjId, player);

trunk/AE-go_GameServer/src/com/aionemu/gameserver/services/TeleportService.java Download diff

 	 */
 	private void changePosition(Player player, int worldId, int instanceId, float x, float y, float z, byte heading)
 	{
-		if(player.getInstanceId() != instanceId || player.getWorldId() != worldId)
-		{
-			world.getWorldMap(player.getWorldId()).getWorldMapInstanceById(player.getInstanceId()).removePlayer(
-				player.getObjectId());
-			world.getWorldMap(worldId).getWorldMapInstanceById(instanceId).addPlayer(player.getObjectId());
-		}
 		world.despawn(player);
 		world.setPosition(player, worldId, instanceId, x, y, z, heading);
 		player.getController().startProtectionActiveTask();
 		}
 		else
 		{
-			if(player.getInstanceId() != 1 || player.getWorldId() != worldId)
+			world.setPosition(player, worldId, 1, x, y, z, player.getHeading());
-			{
-				world.getWorldMap(player.getWorldId()).getWorldMapInstanceById(player.getInstanceId()).removePlayer(
-					player.getObjectId());
-				world.getWorldMap(worldId).getWorldMapInstanceById(1).addPlayer(player.getObjectId());
-			}
-			world.setPosition(player, worldId, x, y, z, player.getHeading());
 		}
 	}

trunk/AE-go_GameServer/src/com/aionemu/gameserver/utils/guice/DataInjectionModule.java Download diff

 import com.aionemu.gameserver.services.DuelService;
 import com.aionemu.gameserver.services.ExchangeService;
 import com.aionemu.gameserver.services.GroupService;
+import com.aionemu.gameserver.services.InstanceService;
 import com.aionemu.gameserver.services.ItemService;
 import com.aionemu.gameserver.services.LegionService;
 import com.aionemu.gameserver.services.MailService;
 		bind(ServiceProxy.class).in(Scopes.SINGLETON);
 		bind(QuestService.class).in(Scopes.SINGLETON);
 		bind(MailService.class).in(Scopes.SINGLETON);
+		bind(InstanceService.class).in(Scopes.SINGLETON);
 	}
 	@Provides

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/MapRegion.java Download diff

 	void add(VisibleObject object)
 	{
 		objects.put(object.getObjectId(), object);
-		parent.onEnter(object);
 	}
 	/**
 	void remove(VisibleObject object)
 	{
 		objects.remove(object.getObjectId());
-		parent.onLeave(object);
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/World.java Download diff

 import com.aionemu.gameserver.model.gameobjects.VisibleObject;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
 import com.aionemu.gameserver.model.templates.WorldMapTemplate;
-import com.aionemu.gameserver.spawnengine.SpawnEngine;
 import com.aionemu.gameserver.taskmanager.tasks.KnownListUpdateTask.KnownListUpdateMode;
 import com.aionemu.gameserver.utils.idfactory.IDFactory;
 import com.aionemu.gameserver.utils.idfactory.IDFactoryAionObject;
 	private final Map<Integer, WorldMap>	worldMaps	= new HashMap<Integer, WorldMap>();
 	private IDFactory						aionObjectsIDFactory;
-	@Inject
-	private SpawnEngine						spawnEngine;
 	/**
 	 * Constructor.
 	}
 	/**
-	 * @return the spawnEngine
-	 */
-	public SpawnEngine getSpawnEngine()
-	{
-		return spawnEngine;
-	}
-	/**
 	 * Return World Map by id
 	 *
 	 * @param id
 			throw new WorldMapNotExistException("Map: " + id + " not exist!");
 		return map;
 	}
-	/**
-	 *
-	 * @param worldId
-	 * @return WorldMapInstance
-	 */
-	public WorldMapInstance getNextAvailableInstance(int worldId)
-	{
-		WorldMap map = worldMaps.get(worldId);
-		return map.getNextFreeInstance();
-	}
-	public void destroyInstance(int worldId, int instanceId)
-	{
-		WorldMap map = worldMaps.get(worldId);
-		map.removeWorldMapInstance(instanceId);
-	}
 	/**
 	 * Update position of VisibleObject [used when object is moving on one map instance]. Check if active map region
 	 * changed and do all needed updates.
 		object.getPosition().setIsSpawned(true);
 		if(object.getSpawn() != null)
 			object.getSpawn().setSpawned(true, object.getInstanceId());
+		object.getActiveRegion().getParent().addObject(object);
 		object.getActiveRegion().add(object);
 		object.updateKnownlist();
 	 */
 	public void despawn(VisibleObject object)
 	{
+		object.getActiveRegion().getParent().removeObject(object);
 		object.getActiveRegion().remove(object);
 		object.getPosition().setIsSpawned(false);
 		if(object.getSpawn() != null)
 		object.clearKnownlist();
 	}
-	/**
-	 * dummy method to initialize World.
-	 */
-	public static void init()
-	{
-	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/WorldMap.java Download diff

 package com.aionemu.gameserver.world;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-import org.apache.log4j.Logger;
 import com.aionemu.gameserver.model.templates.WorldMapTemplate;
 /**
  */
 public class WorldMap
 {
-	private static Logger log = Logger.getLogger(WorldMap.class);
 	private WorldMapTemplate				worldMapTemplate;
 	private int nextInstanceId = 1;
 		int twinCount = worldMapTemplate.getTwinCount();
 		return twinCount > 0 ? twinCount : 1;
 	}
-	/**
-	 *  Will create new instance if there are not free yet and spawn according to xml data
-	 *  //TODO limit
-	 * @return WorldMapInstance
-	 */
-	public synchronized WorldMapInstance getNextFreeInstance()
-	{
-		if (!worldMapTemplate.isInstance())
-		{
-			for(WorldMapInstance instance : instances.values())
-			{
-				if(!instance.isInUse())
-					return instance;
-			}
-		}
-		log.info("Creating new instance: " + worldMapTemplate.getMapId() + " " + nextInstanceId );
-		if (worldMapTemplate.isInstance())
-			addInstance(nextInstanceId, new WorldMapScriptInstance(this, nextInstanceId));
-		else
-			addInstance(nextInstanceId, new WorldMapInstance(this, nextInstanceId));
-		world.getSpawnEngine().spawnInstance(worldMapTemplate.getMapId(), nextInstanceId-1);
-		return instances.get(nextInstanceId-1);
-	}
 	/**
 	 * Return a WorldMapInstance - depends on map configuration one map may have twins instances to balance player. This
 	 * method will return WorldMapInstance by server chose.
 	 *
+	 *
 	 * @return WorldMapInstance.
 	 */
 	public WorldMapInstance getWorldMapInstance()
 	{
-		/**
+		//TODO Balance players into instances.
-		 * twin map - balance players
+		return getWorldMapInstance(1);
-		 */
-		if(worldMapTemplate.getTwinCount() != 0)
-		{
-			/**
-			 * Balance players into instances.
-			 */
-			int i = 1;
-			while(i <= worldMapTemplate.getTwinCount())
-			{
-				WorldMapInstance inst = getWorldMapInstance(i);
-				i++;
-				// TODO! user count etc..
-				return inst;
-			}
-			// TODO! whats now?
-			return getWorldMapInstance(worldMapTemplate.getTwinCount());
-		}
-		else
-			return getWorldMapInstance(1);
 	}
 	/**
 	 * Remove WorldMapInstance by instanceId.
 	 *
 	 * @param instanceId
-	 * @return WorldMapInstance/
 	 */
-	public WorldMapInstance removeWorldMapInstance(int instanceId)
+	public void removeWorldMapInstance(int instanceId)
 	{
-		WorldMapInstance instance = instances.get(instanceId);
+		instances.remove(instanceId);
-		if (instance != null)
-		{
-			instance.destroyInstance();
-			return instances.remove(instanceId);
-		}
-		return null;
 	}
-	public int getWorldMapScriptInstanceIdByPlyerObjId(int objId)
+	/**
+	 *  Add instance to map and increases pointer to nextInstanceId
+	 *
+	 * @param instanceId
+	 * @param instance
+	 */
+	public void addInstance(int instanceId, WorldMapInstance instance)
 	{
-		for (WorldMapInstance instance : instances.values())
-		{
-			if (instance.isInInstance(objId))
-				return instance.getInstanceId();
-		}
-		return -1;
-	}
-	private void addInstance(int instanceId, WorldMapInstance instance)
-	{
 		instances.put(instanceId, instance);
 		nextInstanceId++;
 	}
 	{
 		return world;
 	}
+	/**
+	 * @return the nextInstanceId
+	 */
+	public int getNextInstanceId()
+	{
+		return nextInstanceId;
+	}
+	/**
+	 *  Whether this world map is instance type
+	 *
+	 * @return
+	 */
+	public boolean isInstanceType()
+	{
+		return worldMapTemplate.isInstance();
+	}
+	/**
+	 * @return
+	 */
+	public Iterator<WorldMapInstance> iterator()
+	{
+		return instances.values().iterator();
+	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/WorldMapInstance.java Download diff

  */
 package com.aionemu.gameserver.world;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Future;
+import com.aionemu.gameserver.model.gameobjects.AionObject;
 import com.aionemu.gameserver.model.gameobjects.VisibleObject;
 import com.aionemu.gameserver.model.gameobjects.player.Player;
+import com.aionemu.gameserver.world.exceptions.DuplicateAionObjectException;
 /**
  * World map instance object.
 	/**
 	 * Size of region
 	 */
-	public static final int				regionSize		= 500;
+	public static final int						regionSize			= 500;
 	/**
 	 * Max world size - actually it must be some value bigger than world size. Used only for id generation.
 	 */
-	private static final int				maxWorldSize	= 10000;
+	private static final int					maxWorldSize		= 10000;
 	/**
 	 * WorldMap witch is parent of this instance.
 	 */
-	private final WorldMap					parent;
+	private final WorldMap						parent;
 	/**
-	 * List of active regions.
+	 * Map of active regions.
 	 */
-	private final Map<Integer, MapRegion>	regions			= new HashMap<Integer, MapRegion>();
+	private final Map<Integer, MapRegion>		regions				= new HashMap<Integer, MapRegion>();
 	/**
-	 * Current player count in this instance
+	 * All objects spawned in this world map instance
 	 */
-	private int 							currentPlayerCount;
+	private final Map<Integer, VisibleObject>	worldMapObjects		= new ConcurrentHashMap<Integer, VisibleObject>();
-	private int								instanceId;
 	/**
+	 * All players spawned in this world map instance
+	 */
+	private final Map<Integer, Player>			worldMapPlayers		= new ConcurrentHashMap<Integer, Player>();
+	private final Set<Integer>					registeredObjects	= Collections
+																		.newSetFromMap(new ConcurrentHashMap<Integer, Boolean>());
+	/**
+	 * Id of this instance (channel)
+	 */
+	private int									instanceId;
+	/**
+	 * Destroy task of this instance
+	 */
+	private Future<?>							destroyTask;
+	/**
 	 * Constructor.
 	 *
 	 * @param parent
 	 */
-	WorldMapInstance(WorldMap parent, int instanceId)
+	public WorldMapInstance(WorldMap parent, int instanceId)
 	{
 		this.parent = parent;
 		this.instanceId = instanceId;
 	{
 		return getParent().getWorld();
 	}
 	/**
-	 * @return the currentPlayerCount
+	 *
+	 * @param object
 	 */
-	public int getCurrentPlayerCount()
+	public void addObject(VisibleObject object)
 	{
-		return currentPlayerCount;
+		if(worldMapObjects.put(object.getObjectId(), object) != null)
+			throw new DuplicateAionObjectException();
+		if(object instanceof Player)
+			worldMapPlayers.put(object.getObjectId(), (Player) object);
 	}
-	public void onEnter(VisibleObject object)
+	/**
+	 *
+	 * @param object
+	 */
+	public void removeObject(AionObject object)
 	{
-		if (object instanceof Player)
+		worldMapObjects.remove(object.getObjectId());
-			currentPlayerCount++;
+		if(object instanceof Player)
+			worldMapPlayers.remove(object.getObjectId());
 	}
-	public void onLeave(VisibleObject object)
-	{
-		if (object instanceof Player)
-			currentPlayerCount--;
-	}
-	public boolean isInUse()
-	{
-		return currentPlayerCount > 0;
-	}
 	/**
 	 * @return the instanceIndex
 		return instanceId;
 	}
+	/**
+	 *  Check player is in instance
+	 *
+	 * @param objId
+	 * @return
+	 */
 	public boolean isInInstance(int objId)
 	{
-		return false;
+		return worldMapPlayers.containsKey(objId);
 	}
-	public void setDestroyTime(int sec)
+	/**
-	{
+	 * @return the destroyTask
+	 */
+	public Future<?> getDestroyTask()
+	{
+		return destroyTask;
 	}
-	public void destroyInstance()
+	/**
+	 * @param destroyTask the destroyTask to set
+	 */
+	public void setDestroyTask(Future<?> destroyTask)
 	{
+		this.destroyTask = destroyTask;
 	}
-	public void addPlayer(int objId)
+	/**
+	 * @return
+	 */
+	public Iterator<VisibleObject> objectIterator()
 	{
+		return worldMapObjects.values().iterator();
 	}
+	/**
+	 * @return
+	 */
+	public Iterator<Player> playerIterator()
+	{
+		return worldMapPlayers.values().iterator();
+	}
+	/**
+	 * @param objectId
+	 */
+	public void register(int objectId)
+	{
+		registeredObjects.add(objectId);
+	}
-	public void removePlayer(int objId)
+	/**
+	 * @param objectId
+	 * @return
+	 */
+	public boolean isRegistered(int objectId)
 	{
+		return registeredObjects.contains(objectId);
 	}
 }

trunk/AE-go_GameServer/src/com/aionemu/gameserver/world/WorldType.java

Show contents