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

Core/Spells: Fixed crash in AuraEffect.HandlePlayScene

Browse Source
This commit is contained in:
hondacrx
2018-08-01 14:16:35 -04:00
parent ae08c81ce6
commit 9f962377fa
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/SceneMgr.cs
+1 -1
View File
@@ -38,7 +38,7 @@ namespace Game.Entities
return PlaySceneByTemplate(sceneTemplate, position); return PlaySceneByTemplate(sceneTemplate, position);
} }
uint PlaySceneByTemplate(SceneTemplate sceneTemplate, Position position = null) public uint PlaySceneByTemplate(SceneTemplate sceneTemplate, Position position = null)
{ {
if (sceneTemplate == null) if (sceneTemplate == null)
return 0; return 0;
Source/Game/Spells/Auras/AuraEffect.cs
+4 -5
View File
@@ -5977,16 +5977,15 @@ namespace Game.Spells
if (!player) if (!player)
return; return;
uint sceneId = (uint)GetMiscValue(); SceneTemplate sceneTemplate = Global.ObjectMgr.GetSceneTemplate((uint)GetMiscValue());
if (sceneTemplate == null)
return;
if (apply) if (apply)
player.GetSceneMgr().PlayScene(sceneId); player.GetSceneMgr().PlaySceneByTemplate(sceneTemplate);
else else
{
SceneTemplate sceneTemplate = Global.ObjectMgr.GetSceneTemplate(sceneId);
player.GetSceneMgr().CancelSceneByPackageId(sceneTemplate.ScenePackageId); player.GetSceneMgr().CancelSceneByPackageId(sceneTemplate.ScenePackageId);
} }
}
[AuraEffectHandler(AuraType.AreaTrigger)] [AuraEffectHandler(AuraType.AreaTrigger)]
void HandleCreateAreaTrigger(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply) void HandleCreateAreaTrigger(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply)