Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Instances: Add instance reset events at lock expiration

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/20357af88ec9265869cca3c1db3c5f43ef37e587)
This commit is contained in:
hondacrx
2022-10-04 20:05:57 -04:00
parent 60995d9a93
commit e377263fea
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Maps/Instances/InstanceLockManager.cs
-1
View File
@@ -279,7 +279,6 @@ namespace Game.Maps
if (instanceLock.IsExpired()) if (instanceLock.IsExpired())
{ {
Cypher.Assert(instanceLock.IsExtended(), "Instance lock must have been extended to create instance map from it");
instanceLock.SetExpiryTime(GetNextResetTime(entries)); instanceLock.SetExpiryTime(GetNextResetTime(entries));
instanceLock.SetExtended(false); instanceLock.SetExtended(false);
Log.outDebug(LogFilter.Instance, $"[{entries.Map.Id}-{entries.Map.MapName[Global.WorldMgr.GetDefaultDbcLocale()]} | " + Log.outDebug(LogFilter.Instance, $"[{entries.Map.Id}-{entries.Map.MapName[Global.WorldMgr.GetDefaultDbcLocale()]} | " +
Source/Game/Maps/Map.cs
+33 -9
View File
@@ -4770,7 +4770,10 @@ namespace Game.Maps
Global.WorldStateMgr.SetValue(WorldStates.TeamInInstanceHorde, instanceTeam == TeamId.Horde ? 1 : 0, false, this); Global.WorldStateMgr.SetValue(WorldStates.TeamInInstanceHorde, instanceTeam == TeamId.Horde ? 1 : 0, false, this);
if (i_instanceLock != null) if (i_instanceLock != null)
{
i_instanceLock.SetInUse(true); i_instanceLock.SetInUse(true);
i_instanceExpireEvent = i_instanceLock.GetExpiryTime(); // ignore extension state for reset event (will ask players to accept extended save on expiration)
}
} }
~InstanceMap() ~InstanceMap()
@@ -4795,9 +4798,6 @@ namespace Game.Maps
return EnterState.CannotEnterAlreadyInMap; return EnterState.CannotEnterAlreadyInMap;
} }
if (m_shuttingDown)
return EnterState.CannotEnterInstanceShuttingDown;
// allow GM's to enter // allow GM's to enter
if (player.IsGameMaster()) if (player.IsGameMaster())
return base.CannotEnter(player); return base.CannotEnter(player);
@@ -4883,6 +4883,12 @@ namespace Game.Maps
if (i_scenario != null) if (i_scenario != null)
i_scenario.Update(diff); i_scenario.Update(diff);
if (i_instanceExpireEvent.HasValue && i_instanceExpireEvent.Value < GameTime.GetSystemTime())
{
Reset(InstanceResetMethod.Expire);
i_instanceExpireEvent = Global.InstanceLockMgr.GetNextResetTime(new MapDb2Entries(GetEntry(), GetMapDifficulty()));
}
} }
public override void RemovePlayerFromMap(Player player, bool remove) public override void RemovePlayerFromMap(Player player, bool remove)
@@ -4894,7 +4900,7 @@ namespace Game.Maps
// if last player set unload timer // if last player set unload timer
if (m_unloadTimer == 0 && GetPlayers().Count == 1) if (m_unloadTimer == 0 && GetPlayers().Count == 1)
m_unloadTimer = m_shuttingDown ? 1 : (uint)Math.Max(WorldConfig.GetIntValue(WorldCfg.InstanceUnloadDelay), 1); m_unloadTimer = (i_instanceLock != null && i_instanceLock.IsExpired()) ? 1 : (uint)Math.Max(WorldConfig.GetIntValue(WorldCfg.InstanceUnloadDelay), 1);
if (i_scenario != null) if (i_scenario != null)
i_scenario.OnPlayerExit(player); i_scenario.OnPlayerExit(player);
@@ -4964,12 +4970,30 @@ namespace Game.Maps
// no client notification // no client notification
break; break;
case InstanceResetMethod.Expire: case InstanceResetMethod.Expire:
// on lock expiration boot players (do we also care about extension state?) {
// set the homebind timer for players inside (1 minute) RaidInstanceMessage raidInstanceMessage = new();
raidInstanceMessage.Type = InstanceResetWarningType.Expired;
raidInstanceMessage.MapID = GetId();
raidInstanceMessage.DifficultyID = GetDifficultyID();
raidInstanceMessage.Write();
PendingRaidLock pendingRaidLock = new();
pendingRaidLock.TimeUntilLock = 60000;
pendingRaidLock.CompletedMask = i_instanceLock.GetData().CompletedEncountersMask;
pendingRaidLock.Extending = true;
pendingRaidLock.WarningOnly = GetEntry().IsFlexLocking();
pendingRaidLock.Write();
foreach (Player player in GetPlayers()) foreach (Player player in GetPlayers())
player.m_InstanceValid = false; {
m_shuttingDown = true; player.SendPacket(raidInstanceMessage);
player.SendPacket(pendingRaidLock);
if (!pendingRaidLock.WarningOnly)
player.SetPendingBind(GetInstanceId(), 60000);
}
break; break;
}
default: default:
break; break;
} }
@@ -5150,7 +5174,7 @@ namespace Game.Maps
InstanceScenario i_scenario; InstanceScenario i_scenario;
InstanceLock i_instanceLock; InstanceLock i_instanceLock;
GroupInstanceReference i_owningGroupRef = new(); GroupInstanceReference i_owningGroupRef = new();
bool m_shuttingDown; DateTime? i_instanceExpireEvent;
} }
public class BattlegroundMap : Map public class BattlegroundMap : Map