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

Core/Maps: Changed functions checking if map can be entered to use TransferAbortReason directly instead of intermediate Map::EnterState enum

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/c3e1ff90a5a217691990ea4662bcaa2405b57fde)
This commit is contained in:
hondacrx
2022-10-11 17:54:34 -04:00
parent d16f8c94c2
commit e5c7244893
8 changed files with 122 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.DB.cs
+3 -25
View File
@@ -2925,32 +2925,10 @@ namespace Game.Entities
}
else if (map.IsDungeon()) // if map is dungeon...
{
EnterState denyReason = ((InstanceMap)map).CannotEnter(this);
if (denyReason != 0) // ... and can't enter map, then look for entry point.
TransferAbortParams denyReason = map.CannotEnter(this); // ... and can't enter map, then look for entry point.
if (denyReason != null)
{
switch (denyReason)
{
case EnterState.CannotEnterDifficultyUnavailable:
SendTransferAborted(map.GetId(), TransferAbortReason.Difficulty, (byte)map.GetDifficultyID());
break;
case EnterState.CannotEnterInstanceBindMismatch:
SendSysMessage(CypherStrings.InstanceBindMismatch, map.GetMapName());
break;
case EnterState.CannotEnterTooManyInstances:
SendTransferAborted(map.GetId(), TransferAbortReason.TooManyInstances);
break;
case EnterState.CannotEnterMaxPlayers:
SendTransferAborted(map.GetId(), TransferAbortReason.MaxPlayers);
break;
case EnterState.CannotEnterZoneInCombat:
SendTransferAborted(map.GetId(), TransferAbortReason.ZoneInCombat);
break;
case EnterState.CannotEnterInstanceShuttingDown:
SendTransferAborted(map.GetId(), TransferAbortReason.NotFound);
break;
default:
break;
}
SendTransferAborted(map.GetId(), denyReason.Reason, denyReason.Arg, denyReason.MapDifficultyXConditionId);
areaTrigger = Global.ObjectMgr.GetGoBackTrigger(mapId);
check = true;
}