Core/DB: Misc fixes

This commit is contained in:
hondacrx
2018-03-11 14:57:40 -04:00
parent 47d1651cb9
commit a2fafd2920
11 changed files with 187 additions and 8 deletions
@@ -111,7 +111,7 @@ namespace Game.DataStorage
Log.outInfo(LogFilter.ServerLoading, "Loaded 0 AreaTrigger templates splines. DB table `spell_areatrigger_splines` is empty.");
}
// 0 1 2 3 4 5 6 7 8 9
// 0 1 2 3 4 5 6 7 8 9
SQLResult templates = DB.World.Query("SELECT Id, Type, Flags, Data0, Data1, Data2, Data3, Data4, Data5, ScriptName FROM `areatrigger_template`");
if (!templates.IsEmpty())
{
+1 -2
View File
@@ -132,9 +132,8 @@ namespace Game.Entities
ushort _meleeAnimKitId;
}
public class DiminishingReturn
public struct DiminishingReturn
{
public DiminishingReturn() { }
public DiminishingReturn(uint hitTime, DiminishingLevels hitCount)
{
Stack = 0;
-5
View File
@@ -2649,9 +2649,6 @@ namespace Game.Entities
public DiminishingLevels GetDiminishing(DiminishingGroup group)
{
DiminishingReturn diminish = m_Diminishing[(int)group];
if (diminish == null)
return DiminishingLevels.Level1;
if (diminish.HitCount == 0)
return DiminishingLevels.Level1;
@@ -2778,8 +2775,6 @@ namespace Game.Entities
{
// Checking for existing in the table
DiminishingReturn diminish = m_Diminishing[(int)group];
if (diminish == null)
diminish = new DiminishingReturn();
if (apply)
++diminish.Stack;