Core/Instances: Reimplement resetting instances from UI

Port From (https://github.com/TrinityCore/TrinityCore/commit/ddd0c7b152d65b980db0cc2d00f15ae62a602936)
This commit is contained in:
hondacrx
2022-10-04 14:31:07 -04:00
parent 67d6fa48eb
commit 807caef08c
7 changed files with 147 additions and 140 deletions
+8
View File
@@ -2892,6 +2892,11 @@ namespace Game.Entities
// flight will started later
}
}
else if (mapEntry.IsDungeon() && instanceId != 0)
{
// try finding instance by id first
map = Global.MapMgr.FindMap(mapId, instanceId);
}
// Map could be changed before
mapEntry = CliDB.MapStorage.LookupByKey(mapId);
@@ -2940,6 +2945,9 @@ namespace Game.Entities
case EnterState.CannotEnterZoneInCombat:
SendTransferAborted(map.GetId(), TransferAbortReason.ZoneInCombat);
break;
case EnterState.CannotEnterInstanceShuttingDown:
SendTransferAborted(map.GetId(), TransferAbortReason.NotFound);
break;
default:
break;
}