BETA: Minor Fixes for /loc in RespawnZones by Nyaran. '''NOTE: Require DataPack [DP8240]'''

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -222,7 +222,7 @@ public class DoorTable
 			door.setRange(rangeXMin, rangeYMin, rangeZMin, rangeXMax, rangeYMax, rangeZMax);
 			door.setCurrentHpMp(door.getMaxHp(), door.getMaxMp());
 			door.setXYZInvisible(x, y, z);
-			door.setMapRegion(MapRegionManager.getInstance().getMapRegionId(x, y));
+			door.setMapRegion(MapRegionManager.getInstance().getMapRegionLocId(x, y));
 			door.setEmitter(emitter);
 			door.setTargetable(targetable);
 			
@@ -300,7 +300,7 @@ public class DoorTable
 		if (instanceId > 0 && InstanceManager.getInstance().getInstance(instanceId) != null)
 			allDoors = InstanceManager.getInstance().getInstance(instanceId).getDoors();
 		else
-			allDoors = _regions.get(MapRegionManager.getInstance().getMapRegionId(x, y));
+			allDoors = _regions.get(MapRegionManager.getInstance().getMapRegionLocId(x, y));
 		
 		if (allDoors == null)
 			return false;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MapRegionManager.java

@@ -219,7 +219,7 @@ public class MapRegionManager
 		return null;
 	}
 	
-	public final int getMapRegionId(int locX, int locY)
+	public final int getMapRegionLocId(int locX, int locY)
 	{
 		L2MapRegion region = getMapRegion(locX, locY);
 		if (region != null)
@@ -235,9 +235,9 @@ public class MapRegionManager
 		return getMapRegion(obj.getX(), obj.getY());
 	}
 	
-	public final int getMapRegionId(L2Object obj)
+	public final int getMapRegionLocId(L2Object obj)
 	{
-		return getMapRegionId(obj.getX(), obj.getY());
+		return getMapRegionLocId(obj.getX(), obj.getY());
 	}
 	
 	public final int getMapRegionX(int posX)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2CastleTeleporterInstance.java

@@ -109,13 +109,13 @@ public final class L2CastleTeleporterInstance extends L2Npc
 			{
 				NpcSay cs = new NpcSay(getObjectId(), 1, getNpcId(), 1000443); // The defenders of $s1 castle will be teleported to the inner castle.
 				cs.addStringParameter(getCastle().getName());
-				int region = MapRegionManager.getInstance().getMapRegionId(getX(), getY());
+				int region = MapRegionManager.getInstance().getMapRegionLocId(getX(), getY());
 				Collection<L2PcInstance> pls = L2World.getInstance().getAllPlayers().values();
 				//synchronized (L2World.getInstance().getAllPlayers())
 				{
 					for (L2PcInstance player : pls)
 					{
-						if (region == MapRegionManager.getInstance().getMapRegionId(player.getX(), player.getY()))
+						if (region == MapRegionManager.getInstance().getMapRegionLocId(player.getX(), player.getY()))
 							player.sendPacket(cs);
 					}
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Instance.java

@@ -248,7 +248,7 @@ public class Instance
 		newdoor.setRange(temp.getXMin(), temp.getYMin(), temp.getZMin(), temp.getXMax(), temp.getYMax(), temp.getZMax());
 		try
 		{
-			newdoor.setMapRegion(MapRegionManager.getInstance().getMapRegionId(temp));
+			newdoor.setMapRegion(MapRegionManager.getInstance().getMapRegionLocId(temp));
 		}
 		catch (Exception e)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2RespawnZone.java

@@ -60,7 +60,7 @@ public class L2RespawnZone extends L2ZoneType
 		_raceRespawnPoint.put(Race.valueOf(race), point);
 	}
 	
-	public Map<Race, String> getAll()
+	public Map<Race, String> getAllRespawnPoints()
 	{
 		return _raceRespawnPoint;
 	}