Bladeren bron

TvT Event onLogout() now called on disconnects too.

_DS_ 16 jaren geleden
bovenliggende
commit
9105823f97

+ 10 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -11061,6 +11061,16 @@ public final class L2PcInstance extends L2Playable
 			}
 		}
 		
+		// TvT Event removal
+		try
+		{
+			TvTEvent.onLogout(this);
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.SEVERE, "deleteMe()", e);
+		}
+
 		// Update database with items in its inventory and remove them from the world
 		try
 		{

+ 0 - 3
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/Logout.java

@@ -27,7 +27,6 @@ import net.sf.l2j.gameserver.datatables.SkillTable;
 import net.sf.l2j.gameserver.model.L2Party;
 import net.sf.l2j.gameserver.model.L2World;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
-import net.sf.l2j.gameserver.model.entity.TvTEvent;
 import net.sf.l2j.gameserver.model.olympiad.Olympiad;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
@@ -103,8 +102,6 @@ public final class Logout extends L2GameClientPacket
 			player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
 		}
 
-		TvTEvent.onLogout(player);
-		
 		if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE)
 				|| (player.isInCraftMode() && Config.OFFLINE_CRAFT_ENABLE))
 		{

+ 0 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestRestart.java

@@ -22,7 +22,6 @@ import net.sf.l2j.gameserver.communitybbs.Manager.RegionBBSManager;
 import net.sf.l2j.gameserver.datatables.SkillTable;
 import net.sf.l2j.gameserver.model.L2Party;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
-import net.sf.l2j.gameserver.model.entity.TvTEvent;
 import net.sf.l2j.gameserver.model.olympiad.Olympiad;
 import net.sf.l2j.gameserver.network.L2GameClient;
 import net.sf.l2j.gameserver.network.SystemMessageId;
@@ -134,7 +133,6 @@ public final class RequestRestart extends L2GameClientPacket
         // detach the client from the char so that the connection isnt closed in the deleteMe
         player.setClient(null);
 
-        TvTEvent.onLogout(player);
         RegionBBSManager.getInstance().changeCommunityBoard();
 
         // removing player from the world