Diff | Source/SVN

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.utils.idfactory.IDFactory;
 import com.aionemu.gameserver.utils.idfactory.IDFactoryAionObject;
 import com.aionemu.gameserver.world.container.PlayerContainer;
 	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
+	 */
+	public int getNextAvailableInstanceId(int worldId)
+	{
+		WorldMap map = worldMaps.get(worldId);
+		return map.getNextFreeInstanceIndex();
+	}
 	/**
 	 * Update position of VisibleObject [used when object is moving on one map instance]. Check if active map region
 	 */
 	public void setPosition(VisibleObject object, int mapId, float x, float y, float z, byte heading)
 	{
-		int instanceIndex = 1;
+		int instanceId = 1;
 		if(object.getWorldId() == mapId)
 		{
-			instanceIndex = object.getInstanceId();
+			instanceId = object.getInstanceId();
 		}
-		this.setPosition(object, mapId, instanceIndex, x, y, z, heading);
+		this.setPosition(object, mapId, instanceId, x, y, z, heading);
 	}
 	/**

AE-go

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