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

Fixes two crashes.

Browse Source
This commit is contained in:
hondacrx
2021-05-17 14:03:58 -04:00
parent cb06e572f3
commit 861f0575de
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Object/WorldObject.cs
+7 -16
View File
@@ -885,65 +885,56 @@ namespace Game.Entities
// stat system helpers // stat system helpers
public void SetUpdateFieldStatValue<T>(IUpdateField<T> updateField, T value) where T : new() public void SetUpdateFieldStatValue<T>(IUpdateField<T> updateField, T value) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types"); SetUpdateFieldValue(updateField, (T)Math.Max((dynamic)value, 0));
SetUpdateFieldValue(updateField, Math.Max((dynamic)value, 0));
} }
public void SetUpdateFieldStatValue<T>(ref T oldValue, T value) public void SetUpdateFieldStatValue<T>(ref T oldValue, T value) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types"); SetUpdateFieldValue(ref oldValue, (T)Math.Max((dynamic)value, 0));
SetUpdateFieldValue(ref oldValue, Math.Max((dynamic)value, 0));
} }
public void ApplyModUpdateFieldValue<T>(IUpdateField<T> updateField, T mod, bool apply) where T : new() public void ApplyModUpdateFieldValue<T>(IUpdateField<T> updateField, T mod, bool apply) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types");
dynamic value = updateField.GetValue(); dynamic value = updateField.GetValue();
if (apply) if (apply)
value += mod; value += mod;
else else
value -= mod; value -= mod;
SetUpdateFieldValue(updateField, value); SetUpdateFieldValue(updateField, (T)value);
} }
public void ApplyModUpdateFieldValue<T>(ref T oldvalue, T mod, bool apply) where T : new() public void ApplyModUpdateFieldValue<T>(ref T oldvalue, T mod, bool apply) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types");
dynamic value = oldvalue; dynamic value = oldvalue;
if (apply) if (apply)
value += mod; value += mod;
else else
value -= mod; value -= mod;
SetUpdateFieldValue(ref oldvalue, value); SetUpdateFieldValue(ref oldvalue, (T)value);
} }
public void ApplyPercentModUpdateFieldValue<T>(IUpdateField<T> updateField, float percent, bool apply) where T : new() public void ApplyPercentModUpdateFieldValue<T>(IUpdateField<T> updateField, float percent, bool apply) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types");
dynamic value = updateField.GetValue(); dynamic value = updateField.GetValue();
if (percent == -100.0f) if (percent == -100.0f)
percent = -99.99f; percent = -99.99f;
value *= (apply ? (100.0f + percent) / 100.0f : 100.0f / (100.0f + percent)); value *= (apply ? (100.0f + percent) / 100.0f : 100.0f / (100.0f + percent));
SetUpdateFieldValue(updateField, value); SetUpdateFieldValue(updateField, (T)value);
} }
public void ApplyPercentModUpdateFieldValue<T>(ref T oldValue, float percent, bool apply) where T : new() public void ApplyPercentModUpdateFieldValue<T>(ref T oldValue, float percent, bool apply) where T : new()
{ {
//static_assert(std::is_arithmetic < T >::value, "SetUpdateFieldStatValue must be used with arithmetic types");
dynamic value = oldValue; dynamic value = oldValue;
if (percent == -100.0f) if (percent == -100.0f)
percent = -99.99f; percent = -99.99f;
value *= (apply ? (100.0f + percent) / 100.0f : 100.0f / (100.0f + percent)); value *= (apply ? (100.0f + percent) / 100.0f : 100.0f / (100.0f + percent));
SetUpdateFieldValue(ref oldValue, value); SetUpdateFieldValue(ref oldValue, (T)value);
} }
public void ForceUpdateFieldChange() public void ForceUpdateFieldChange()
Source/Game/Entities/Player/Player.Quest.cs
+1 -1
View File
@@ -2512,7 +2512,7 @@ namespace Game.Entities
} }
int objectiveIndex = quest.Objectives.IndexOf(objective); int objectiveIndex = quest.Objectives.IndexOf(objective);
if (objectiveIndex == -1) if (objectiveIndex == 0)
return true; return true;
// check sequenced objectives // check sequenced objectives