BETA: Reworked `NoRestartZone` to be retail like.

	* Cleaned up all empty onDieInside & onReviveInside from zone types.
	* Dropped character_norestart_zone_time database table.
	* Added 2 more events in `L2ZoneType` onPlayerLoginInside & onPlayerLogoutInside.

Reviewed by: !UnAfraid

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

@@ -244,7 +244,6 @@ import com.l2jserver.gameserver.model.variables.PlayerVariables;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
-import com.l2jserver.gameserver.model.zone.type.L2NoRestartZone;
 import com.l2jserver.gameserver.network.L2GameClient;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.communityserver.CommunityServerThread;
@@ -379,11 +378,6 @@ public final class L2PcInstance extends L2Playable
 	// Character Shortcut SQL String Definitions:
 	private static final String DELETE_CHAR_SHORTCUTS = "DELETE FROM character_shortcuts WHERE charId=? AND class_index=?";
 	
-	// Character zone restart time SQL String Definitions - L2Master mod
-	private static final String DELETE_ZONE_RESTART_LIMIT = "DELETE FROM character_norestart_zone_time WHERE charId = ?";
-	private static final String LOAD_ZONE_RESTART_LIMIT = "SELECT time_limit FROM character_norestart_zone_time WHERE charId = ?";
-	private static final String UPDATE_ZONE_RESTART_LIMIT = "REPLACE INTO character_norestart_zone_time (charId, time_limit) VALUES (?,?)";
-	
 	private static final String COND_OVERRIDE_KEY = "cond_override";
 	
 	public static final String NEWBIE_KEY = "NEWBIE";
@@ -456,7 +450,6 @@ public final class L2PcInstance extends L2Playable
 	private long _onlineBeginTime;
 	private long _lastAccess;
 	private long _uptime;
-	private long _zoneRestartLimitTime = 0;
 	
 	private final ReentrantLock _subclassLock = new ReentrantLock();
 	protected int _baseClass;
@@ -3041,71 +3034,6 @@ public final class L2PcInstance extends L2Playable
 		_onlineBeginTime = System.currentTimeMillis();
 	}
 	
-	public long getZoneRestartLimitTime()
-	{
-		return _zoneRestartLimitTime;
-	}
-	
-	public void setZoneRestartLimitTime(long time)
-	{
-		_zoneRestartLimitTime = time;
-	}
-	
-	public void storeZoneRestartLimitTime()
-	{
-		if (isInsideZone(ZoneId.NO_RESTART))
-		{
-			L2NoRestartZone zone = null;
-			for (L2ZoneType tmpzone : ZoneManager.getInstance().getZones(this))
-			{
-				if (tmpzone instanceof L2NoRestartZone)
-				{
-					zone = (L2NoRestartZone) tmpzone;
-					break;
-				}
-			}
-			if (zone != null)
-			{
-				try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-					PreparedStatement statement = con.prepareStatement(UPDATE_ZONE_RESTART_LIMIT))
-				{
-					statement.setInt(1, getObjectId());
-					statement.setLong(2, System.currentTimeMillis() + (zone.getRestartAllowedTime() * 1000));
-					statement.execute();
-				}
-				catch (SQLException e)
-				{
-					_log.log(Level.WARNING, "Cannot store zone norestart limit for character " + getObjectId(), e);
-				}
-			}
-		}
-	}
-	
-	private void restoreZoneRestartLimitTime()
-	{
-		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement ps1 = con.prepareStatement(LOAD_ZONE_RESTART_LIMIT))
-		{
-			ps1.setInt(1, getObjectId());
-			try (ResultSet rset = ps1.executeQuery())
-			{
-				if (rset.next())
-				{
-					setZoneRestartLimitTime(rset.getLong("time_limit"));
-					try (PreparedStatement ps2 = con.prepareStatement(DELETE_ZONE_RESTART_LIMIT))
-					{
-						ps2.setInt(1, getObjectId());
-						ps2.executeUpdate();
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "Could not restore " + this + " zone restart time: " + e.getMessage(), e);
-		}
-	}
-	
 	/**
 	 * Return the PcInventory Inventory of the L2PcInstance contained in _inventory.
 	 */
@@ -7377,8 +7305,6 @@ public final class L2PcInstance extends L2Playable
 				player.restoreUISettings();
 			}
 			
-			player.restoreZoneRestartLimitTime();
-			
 			if (player.isGM())
 			{
 				final long masks = player.getVariables().getLong(COND_OVERRIDE_KEY, PcCondOverride.getAllExceptionsMask());
@@ -10887,6 +10813,18 @@ public final class L2PcInstance extends L2Playable
 			checkPlayerSkills();
 		}
 		getEvents().onPlayerLogin();
+		
+		try
+		{
+			for (L2ZoneType zone : ZoneManager.getInstance().getZones(this))
+			{
+				zone.onPlayerLoginInside(this);
+			}
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.SEVERE, "", e);
+		}
 	}
 	
 	public long getLastAccess()
@@ -11516,6 +11454,18 @@ public final class L2PcInstance extends L2Playable
 	{
 		getEvents().onPlayerLogout();
 		
+		try
+		{
+			for (L2ZoneType zone : ZoneManager.getInstance().getZones(this))
+			{
+				zone.onPlayerLogoutInside(this);
+			}
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.SEVERE, "deleteMe()", e);
+		}
+		
 		// Set the online Flag to True or False and update the characters table of the database with online status and lastAccess (called when login and logout)
 		try
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java

@@ -517,9 +517,21 @@ public abstract class L2ZoneType
 	
 	protected abstract void onExit(L2Character character);
 	
-	public abstract void onDieInside(L2Character character);
+	public void onDieInside(L2Character character)
+	{
+	}
+	
+	public void onReviveInside(L2Character character)
+	{
+	}
 	
-	public abstract void onReviveInside(L2Character character);
+	public void onPlayerLoginInside(L2PcInstance player)
+	{
+	}
+	
+	public void onPlayerLogoutInside(L2PcInstance player)
+	{
+	}
 	
 	public Map<Integer, L2Character> getCharacters()
 	{

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

@@ -62,14 +62,4 @@ public class L2ArenaZone extends L2ZoneType
 		
 		character.setInsideZone(ZoneId.PVP, false);
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -437,16 +437,6 @@ public class L2BossZone extends L2ZoneType
 		}
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public void updateKnownList(L2Npc npc)
 	{
 		if ((_characterList == null) || _characterList.isEmpty())

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

@@ -83,14 +83,4 @@ public class L2ConditionZone extends L2ZoneType
 			}
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -218,14 +218,4 @@ public class L2DamageZone extends L2ZoneType
 			}
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -50,14 +50,4 @@ public class L2DerbyTrackZone extends L2ZoneType
 			character.setInsideZone(ZoneId.MONSTER_TRACK, false);
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -273,14 +273,4 @@ public class L2EffectZone extends L2ZoneType
 			}
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -42,16 +42,6 @@ public class L2FishingZone extends L2ZoneType
 	{
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	/*
 	 * getWaterZ() this added function returns the Z value for the water surface. In effect this simply returns the upper Z value of the zone. This required some modification of L2ZoneForm, and zone form extentions.
 	 */

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

@@ -75,14 +75,4 @@ public class L2HqZone extends L2ZoneType
 			character.setInsideZone(ZoneId.HQ, false);
 		}
 	}
-	
-	@Override
-	public void onDieInside(final L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(final L2Character character)
-	{
-	}
 }

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

@@ -89,16 +89,6 @@ public class L2JailZone extends L2ZoneType
 		}
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public static Location getLocationIn()
 	{
 		return JAIL_IN_LOC;

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

@@ -50,14 +50,4 @@ public class L2LandingZone extends L2ZoneType
 			character.setInsideZone(ZoneId.LANDING, false);
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -93,17 +93,6 @@ public class L2MotherTreeZone extends L2ZoneType
 		}
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-		
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	/**
 	 * @return the _mpRegen
 	 */

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

@@ -76,14 +76,4 @@ public class L2NoLandingZone extends L2ZoneType
 			}
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -18,7 +18,7 @@
  */
 package com.l2jserver.gameserver.model.zone.type;
 
-import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.GameServer;
 import com.l2jserver.gameserver.model.TeleportWhereType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,6 +32,7 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
 public class L2NoRestartZone extends L2ZoneType
 {
 	private int _restartAllowedTime = 0;
+	private int _restartTime = 0;
 	private boolean _enabled = true;
 	
 	public L2NoRestartZone(int id)
@@ -48,11 +49,11 @@ public class L2NoRestartZone extends L2ZoneType
 		}
 		else if (name.equalsIgnoreCase("restartAllowedTime"))
 		{
-			_restartAllowedTime = Integer.parseInt(value);
+			_restartAllowedTime = Integer.parseInt(value) * 1000;
 		}
 		else if (name.equalsIgnoreCase("restartTime"))
 		{
-			// Do nothing.
+			_restartTime = Integer.parseInt(value) * 1000;
 		}
 		else if (name.equalsIgnoreCase("instanceId"))
 		{
@@ -75,13 +76,6 @@ public class L2NoRestartZone extends L2ZoneType
 		if (character.isPlayer())
 		{
 			character.setInsideZone(ZoneId.NO_RESTART, true);
-			L2PcInstance player = (L2PcInstance) character;
-			
-			if ((player.getZoneRestartLimitTime() > 0) && (player.getZoneRestartLimitTime() < System.currentTimeMillis()))
-			{
-				ThreadPoolManager.getInstance().scheduleGeneral(new TeleportTask(player), 2000);
-			}
-			player.setZoneRestartLimitTime(0);
 		}
 	}
 	
@@ -100,13 +94,17 @@ public class L2NoRestartZone extends L2ZoneType
 	}
 	
 	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
+	public void onPlayerLoginInside(L2PcInstance player)
 	{
+		if (!_enabled)
+		{
+			return;
+		}
+		
+		if (((System.currentTimeMillis() - player.getLastAccess()) > getRestartTime()) && ((System.currentTimeMillis() - GameServer.dateTimeServerStarted.getTimeInMillis()) > getRestartAllowedTime()))
+		{
+			player.teleToLocation(TeleportWhereType.TOWN);
+		}
 	}
 	
 	public int getRestartAllowedTime()
@@ -119,19 +117,13 @@ public class L2NoRestartZone extends L2ZoneType
 		_restartAllowedTime = time;
 	}
 	
-	private static class TeleportTask implements Runnable
+	public int getRestartTime()
 	{
-		private final L2PcInstance _player;
-		
-		public TeleportTask(L2PcInstance player)
-		{
-			_player = player;
-		}
-		
-		@Override
-		public void run()
-		{
-			_player.teleToLocation(TeleportWhereType.TOWN);
-		}
+		return _restartTime;
+	}
+	
+	public void setRestartTime(int time)
+	{
+		_restartTime = time;
 	}
 }

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

@@ -50,14 +50,4 @@ public class L2NoStoreZone extends L2ZoneType
 			character.setInsideZone(ZoneId.NO_STORE, false);
 		}
 	}
-	
-	@Override
-	public void onDieInside(final L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(final L2Character character)
-	{
-	}
 }

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

@@ -45,14 +45,4 @@ public class L2NoSummonFriendZone extends L2ZoneType
 	{
 		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false);
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -259,16 +259,6 @@ public class L2OlympiadStadiumZone extends L2ZoneRespawn
 		}
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	private static final class KickPlayer implements Runnable
 	{
 		private L2PcInstance _player;

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

@@ -79,14 +79,4 @@ public class L2PeaceZone extends L2ZoneType
 			character.setInsideZone(ZoneId.NO_STORE, false);
 		}
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -61,16 +61,6 @@ public class L2ResidenceTeleportZone extends L2ZoneRespawn
 		character.setInsideZone(ZoneId.NO_SUMMON_FRIEND, false); // FIXME: Custom ?
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public void oustAllPlayers()
 	{
 		for (L2PcInstance player : getPlayersInside())

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

@@ -19,7 +19,6 @@
 package com.l2jserver.gameserver.model.zone.type;
 
 import com.l2jserver.gameserver.model.TeleportWhereType;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.zone.L2ZoneRespawn;
 
@@ -35,16 +34,6 @@ public abstract class L2ResidenceZone extends L2ZoneRespawn
 		super(id);
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	protected void banishForeigners(int owningClanId, TeleportWhereType type)
 	{
 		for (L2PcInstance temp : getPlayersInside())

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

@@ -49,16 +49,6 @@ public class L2RespawnZone extends L2ZoneType
 	{
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public void addRaceRespawnPoint(String race, String point)
 	{
 		_raceRespawnPoint.put(PcRace.valueOf(race), point);

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

@@ -44,14 +44,4 @@ public class L2ScriptZone extends L2ZoneType
 	{
 		character.setInsideZone(ZoneId.SCRIPT, false);
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -263,11 +263,6 @@ public class L2SiegeZone extends L2ZoneType
 		}
 	}
 	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public void updateZoneStatusForCharactersInside()
 	{
 		if (getSettings().isActiveSiege())

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

@@ -119,14 +119,4 @@ public class L2SwampZone extends L2ZoneType
 	{
 		return _move_bonus;
 	}
-	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
 }

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

@@ -67,16 +67,6 @@ public class L2TownZone extends L2ZoneType
 		character.setInsideZone(ZoneId.TOWN, false);
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	/**
 	 * Returns this zones town id (if any)
 	 * @return

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

@@ -98,16 +98,6 @@ public class L2WaterZone extends L2ZoneType
 		}
 	}
 	
-	@Override
-	public void onDieInside(L2Character character)
-	{
-	}
-	
-	@Override
-	public void onReviveInside(L2Character character)
-	{
-	}
-	
 	public int getWaterZ()
 	{
 		return getZone().getHighZ();

L2J_Server_BETA/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -773,7 +773,6 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>> i
 			{
 				if ((getActiveChar() != null) && !isDetached())
 				{
-					getActiveChar().storeZoneRestartLimitTime();
 					setDetached(true);
 					if (offlineMode(getActiveChar()))
 					{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -496,14 +496,14 @@ public class EnterWorld extends L2GameClientPacket
 			sendPacket(new Die(activeChar));
 		}
 		
-		activeChar.onPlayerEnter();
-		
 		sendPacket(new SkillCoolTime(activeChar));
 		sendPacket(new ExVoteSystemInfo(activeChar));
 		sendPacket(new ExNevitAdventPointInfoPacket(0));
 		sendPacket(new ExNevitAdventTimeChange(-1)); // only set pause state...
 		sendPacket(new ExShowContactList(activeChar));
 		
+		activeChar.onPlayerEnter();
+		
 		for (L2ItemInstance i : activeChar.getInventory().getItems())
 		{
 			if (i.isTimeLimitedItem())