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

Core/Errors: Stop using System.Diagnostics.Contracts, Its just closing the server without error or warning. We now log the error and then throw a exception

Browse Source
This commit is contained in:
hondacrx
2018-06-15 12:34:56 -04:00
parent 1289bc3ed1
commit 7aa494d5dd
86 changed files with 520 additions and 558 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/Condition.cs
+3 -4
View File
@@ -21,7 +21,6 @@ using Game.Entities;
using Game.Maps;
using System;
using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Text;
namespace Game.Conditions
@@ -36,7 +35,7 @@ namespace Game.Conditions
public bool Meets(ConditionSourceInfo sourceInfo)
{
Contract.Assert(ConditionTarget < SharedConst.MaxConditionTargets);
Cypher.Assert(ConditionTarget < SharedConst.MaxConditionTargets);
WorldObject obj = sourceInfo.mConditionTargets[ConditionTarget];
// object not present, return false
if (obj == null)
@@ -62,7 +61,7 @@ namespace Game.Conditions
if (player != null)
{
// don't allow 0 items (it's checked during table load)
Contract.Assert(ConditionValue2 != 0);
Cypher.Assert(ConditionValue2 != 0);
bool checkBank = ConditionValue3 != 0 ? true : false;
condMeets = player.HasItemCount(ConditionValue1, ConditionValue2, checkBank);
}
@@ -486,7 +485,7 @@ namespace Game.Conditions
mask |= GridMapTypeMask.Player;
break;
default:
Contract.Assert(false, "Condition.GetSearcherTypeMaskForCondition - missing condition handling!");
Cypher.Assert(false, "Condition.GetSearcherTypeMaskForCondition - missing condition handling!");
break;
}
return mask;