lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TerritoryWarManager endTerritoryWar method should not be interrupted.

Browse Source
This commit is contained in:
MobiusDev
2018-09-03 17:49:30 +00:00
parent 69fd1ac954
commit dd2356293c
1 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/TerritoryWarManager.java
View File

@@ -942,10 +942,7 @@ public final class TerritoryWarManager implements Siegable
} }
_isTWInProgress = true; _isTWInProgress = true;
if (!updatePlayerTWStateFlags(false)) updatePlayerTWStateFlags(false);
{
return;
}
// teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town // teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town
for (Territory t : activeTerritoryList) for (Territory t : activeTerritoryList)
@@ -1035,15 +1032,7 @@ public final class TerritoryWarManager implements Siegable
} }
} }
if (activeTerritoryList.size() < 2) updatePlayerTWStateFlags(true);
{
return;
}
if (!updatePlayerTWStateFlags(true))
{
return;
}
for (TerritoryWard twWard : _territoryWards) for (TerritoryWard twWard : _territoryWards)
{ {
@@ -1052,6 +1041,8 @@ public final class TerritoryWarManager implements Siegable
_territoryWards.clear(); _territoryWards.clear();
// teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town // teleportPlayer(Siege.TeleportWhoType.Attacker, MapRegionTable.TeleportWhereType.Town); // Teleport to the closest town
if (activeTerritoryList.size() > 1)
{
for (Territory t : activeTerritoryList) for (Territory t : activeTerritoryList)
{ {
final Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId()); final Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
@@ -1102,6 +1093,8 @@ public final class TerritoryWarManager implements Siegable
} }
} }
} }
}
for (L2SiegeFlagInstance flag : _clanFlags.values()) for (L2SiegeFlagInstance flag : _clanFlags.values())
{ {
flag.deleteMe(); flag.deleteMe();
@@ -1115,6 +1108,7 @@ public final class TerritoryWarManager implements Siegable
changeRegistration(castleId, clan.getId(), true); changeRegistration(castleId, clan.getId(), true);
} }
} }
for (Integer castleId : _registeredMercenaries.keySet()) for (Integer castleId : _registeredMercenaries.keySet())
{ {
for (Integer pl_objId : _registeredMercenaries.get(castleId)) for (Integer pl_objId : _registeredMercenaries.get(castleId))
@@ -1122,19 +1116,20 @@ public final class TerritoryWarManager implements Siegable
changeRegistration(castleId, pl_objId, true); changeRegistration(castleId, pl_objId, true);
} }
} }
// change next TW date // change next TW date
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_HAS_ENDED); final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.TERRITORY_WAR_HAS_ENDED);
Broadcast.toAllOnlinePlayers(sm); Broadcast.toAllOnlinePlayers(sm);
} }
protected boolean updatePlayerTWStateFlags(boolean clear) protected void updatePlayerTWStateFlags(boolean clear)
{ {
final Quest twQuest = QuestManager.getInstance().getQuest(qn); final Quest twQuest = QuestManager.getInstance().getQuest(qn);
if (twQuest == null) if (twQuest != null)
{ {
LOGGER.warning(getClass().getSimpleName() + ": missing main Quest!"); twQuest.setOnEnterWorld(_isTWInProgress);
return false;
} }
for (int castleId : _registeredClans.keySet()) for (int castleId : _registeredClans.keySet())
{ {
for (L2Clan clan : _registeredClans.get(castleId)) for (L2Clan clan : _registeredClans.get(castleId))
@@ -1227,8 +1222,6 @@ public final class TerritoryWarManager implements Siegable
} }
} }
} }
twQuest.setOnEnterWorld(_isTWInProgress);
return true;
} }
protected class RewardOnlineParticipants implements Runnable protected class RewardOnlineParticipants implements Runnable