فهرست منبع

BETA: NPE Fixes thanks Starter for report.

Rumen Nikiforov 13 سال پیش
والد
کامیت
6cef023fce

+ 1 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TownManager.java

@@ -66,8 +66,7 @@ public class TownManager
 	
 	
 	public final static boolean townHasCastleInSiege(int x, int y)
 	public final static boolean townHasCastleInSiege(int x, int y)
 	{
 	{
-		int curtown = MapRegionManager.getInstance().getMapRegion(x, y).getLocId();
-		return townHasCastleInSiege(curtown);
+		return townHasCastleInSiege(MapRegionManager.getInstance().getMapRegionLocId(x, y));
 	}
 	}
 	
 	
 	public final static L2TownZone getTown(int townId)
 	public final static L2TownZone getTown(int townId)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2AuctioneerInstance.java

@@ -637,7 +637,7 @@ public final class L2AuctioneerInstance extends L2Npc
 	
 	
 	private String getPictureName(L2PcInstance plyr)
 	private String getPictureName(L2PcInstance plyr)
 	{
 	{
-		int nearestTownId = MapRegionManager.getInstance().getMapRegion(plyr).getLocId();
+		int nearestTownId = MapRegionManager.getInstance().getMapRegionLocId(plyr);
 		String nearestTown;
 		String nearestTown;
 		
 		
 		switch (nearestTownId)
 		switch (nearestTownId)

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java

@@ -478,11 +478,11 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 	public final void broadcastNpcSay(final L2Npc npc, final int type, final int messageId)
 	public final void broadcastNpcSay(final L2Npc npc, final int type, final int messageId)
 	{
 	{
 		final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getNpcId(), NpcStringId.getNpcStringId(messageId));
 		final NpcSay npcSay = new NpcSay(npc.getObjectId(), type, npc.getNpcId(), NpcStringId.getNpcStringId(messageId));
-		int sourceRegion = MapRegionManager.getInstance().getMapRegion(npc.getX(), npc.getY()).getLocId();
+		int sourceRegion = MapRegionManager.getInstance().getMapRegionLocId(npc);
 		final L2PcInstance[] charsInside = L2World.getInstance().getAllPlayersArray();
 		final L2PcInstance[] charsInside = L2World.getInstance().getAllPlayersArray();
 		
 		
 		for(L2PcInstance pc : charsInside)
 		for(L2PcInstance pc : charsInside)
-			if(pc != null && MapRegionManager.getInstance().getMapRegion(pc.getX(), pc.getY()).getLocId() == sourceRegion)
+			if(pc != null && MapRegionManager.getInstance().getMapRegionLocId(pc) == sourceRegion)
 				pc.sendPacket(npcSay);
 				pc.sendPacket(npcSay);
 	}
 	}