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/Entities/Item/Item.cs
+6 -7
View File
@@ -26,7 +26,6 @@ using Game.Network.Packets;
using Game.Spells;
using System;
using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
@@ -759,7 +758,7 @@ namespace Game.Entities
if (item.IsInUpdateQueue())
return;
Contract.Assert(player != null);
Cypher.Assert(player != null);
if (player.GetGUID() != item.GetOwnerGUID())
{
@@ -779,7 +778,7 @@ namespace Game.Entities
if (!item.IsInUpdateQueue())
return;
Contract.Assert(player != null);
Cypher.Assert(player != null);
if (player.GetGUID() != item.GetOwnerGUID())
{
@@ -2054,7 +2053,7 @@ namespace Game.Entities
public int GetItemStatValue(uint index, Player owner)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
uint itemLevel = GetItemLevel(owner);
uint randomPropPoints = ItemEnchantment.GetRandomPropertyPoints(itemLevel, GetQuality(), GetTemplate().GetInventoryType(), GetTemplate().GetSubClass());
if (randomPropPoints != 0)
@@ -2550,7 +2549,7 @@ namespace Game.Entities
if (eff.EquippedItemCount == 0) //all items of a set were removed
{
Contract.Assert(eff == player.ItemSetEff[setindex]);
Cypher.Assert(eff == player.ItemSetEff[setindex]);
player.ItemSetEff[setindex] = null;
}
}
@@ -2632,12 +2631,12 @@ namespace Game.Entities
public ItemQuality GetQuality() { return _bonusData.Quality; }
public int GetItemStatType(uint index)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
return _bonusData.ItemStatType[index];
}
public SocketColor GetSocketColor(uint index)
{
Contract.Assert(index < ItemConst.MaxGemSockets);
Cypher.Assert(index < ItemConst.MaxGemSockets);
return _bonusData.socketColor[index];
}
public uint GetAppearanceModId() { return GetUInt32Value(ItemFields.AppearanceModId); }
Source/Game/Entities/Item/ItemTemplate.cs
+5 -6
View File
@@ -20,7 +20,6 @@ using Game.DataStorage;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.Contracts;
namespace Game.Entities
{
@@ -275,22 +274,22 @@ namespace Game.Entities
public uint GetContainerSlots() { return ExtendedData.ContainerSlots; }
public int GetItemStatType(uint index)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
return ExtendedData.StatModifierBonusStat[index];
}
public int GetItemStatValue(uint index)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
return ExtendedData.ItemStatValue[index];
}
public int GetItemStatAllocation(uint index)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
return ExtendedData.StatPercentEditor[index];
}
public float GetItemStatSocketCostMultiplier(uint index)
{
Contract.Assert(index < ItemConst.MaxStats);
Cypher.Assert(index < ItemConst.MaxStats);
return ExtendedData.StatPercentageOfSocket[index];
}
public uint GetScalingStatDistribution() { return ExtendedData.ScalingStatDistributionID; }
@@ -310,7 +309,7 @@ namespace Game.Entities
public uint GetTotemCategory() { return ExtendedData.TotemCategoryID; }
public SocketColor GetSocketColor(uint index)
{
Contract.Assert(index < ItemConst.MaxGemSockets);
Cypher.Assert(index < ItemConst.MaxGemSockets);
return (SocketColor)ExtendedData.SocketType[index];
}
public uint GetSocketBonus() { return ExtendedData.SocketMatchEnchantmentId; }