BETA: DP-Part of [L6565]

L2J_DataPack_BETA/dist/game/data/scripts/handlers/admincommandhandlers/AdminTerritoryWar.java

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.TerritoryWard;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -109,6 +110,7 @@ public class AdminTerritoryWar implements IAdminCommandHandler
 				else if (cal.getTimeInMillis() != TerritoryWarManager.getInstance().getTWStartTimeInMillis())
 				{
 					TerritoryWarManager.getInstance().setTWStartTimeInMillis(cal.getTimeInMillis());
+					GlobalVariablesManager.getInstance().set(TerritoryWarManager.GLOBAL_VARIABLE, cal.getTimeInMillis());
 				}
 			}
 			showSiegeTimePage(activeChar);

L2J_DataPack_BETA/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java

@@ -79,7 +79,7 @@ public class TerritoryWarSuperClass extends Quest
 			// Calculate next TW date
 			final Calendar cal = Calendar.getInstance();
 			
-			final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong("nextTWStartDate", 0);
+			final long nextSiegeDate = GlobalVariablesManager.getInstance().getLong(TerritoryWarManager.GLOBAL_VARIABLE, 0);
 			if (nextSiegeDate > System.currentTimeMillis())
 			{
 				cal.setTimeInMillis(nextSiegeDate);
@@ -101,6 +101,7 @@ public class TerritoryWarSuperClass extends Quest
 				{
 					cal.add(Calendar.WEEK_OF_YEAR, 2);
 				}
+				GlobalVariablesManager.getInstance().set(TerritoryWarManager.GLOBAL_VARIABLE, cal.getTimeInMillis());
 			}
 			TerritoryWarManager.getInstance().setTWStartTimeInMillis(cal.getTimeInMillis());
 			_log.info(getClass().getSimpleName() + ": Siege date: " + cal.getTime());