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

Core/Entities: don't allow client control if player is still affected by any lose of control state

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/29bfa32fc39de1d93fbdb272d48689174c547725)
This commit is contained in:
hondacrx
2021-06-23 14:13:31 -04:00
parent 87cc42ee48
commit 0c527d206c
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Unit/Unit.Movement.cs
+24 -15
View File
@@ -1113,12 +1113,14 @@ namespace Game.Entities
if (HasAuraType(AuraType.ModStun))
return;
ClearUnitState(state);
SetStunned(false);
break;
case UnitState.Root:
if (HasAuraType(AuraType.ModRoot) || HasAuraType(AuraType.ModRoot2) || GetVehicle() != null)
return;
ClearUnitState(state);
if (!HasUnitState(UnitState.Stunned))
SetRooted(false);
break;
@@ -1126,33 +1128,32 @@ namespace Game.Entities
if (HasAuraType(AuraType.ModConfuse))
return;
ClearUnitState(state);
SetConfused(false);
break;
case UnitState.Fleeing:
if (HasAuraType(AuraType.ModFear))
return;
ClearUnitState(state);
SetFeared(false);
break;
default:
return;
}
ClearUnitState(state);
// Unit States might have been already cleared but auras still present. I need to check with HasAuraType
if (HasAuraType(AuraType.ModStun))
SetStunned(true);
else
{
if (HasAuraType(AuraType.ModRoot) || HasAuraType(AuraType.ModRoot2))
SetRooted(true);
if (HasAuraType(AuraType.ModConfuse))
SetConfused(true);
else if (HasAuraType(AuraType.ModFear))
SetFeared(true);
}
if (HasAuraType(AuraType.ModRoot) || HasAuraType(AuraType.ModRoot2))
SetRooted(true);
if (HasAuraType(AuraType.ModConfuse))
SetConfused(true);
if (HasAuraType(AuraType.ModFear))
SetFeared(true);
}
}
@@ -1251,8 +1252,12 @@ namespace Game.Entities
Player player = ToPlayer();
if (player)
if (player.HasUnitState(UnitState.Possessed))
player.SetClientControl(this, !apply);
{
if (apply)
player.SetClientControl(this, false);
else if (!HasUnitState(UnitState.LostControl))
player.SetClientControl(this, true);
}
}
void SetConfused(bool apply)
@@ -1275,8 +1280,12 @@ namespace Game.Entities
Player player = ToPlayer();
if (player)
if (player.HasUnitState(UnitState.Possessed))
player.SetClientControl(this, !apply);
{
if (apply)
player.SetClientControl(this, false);
else if (!HasUnitState(UnitState.LostControl))
player.SetClientControl(this, true);
}
}
public bool CanFreeMove()