nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-17 02:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix (core): Log correction (#13181)

Browse Source 
fix (core): Commit LOG correction
This commit is contained in:
M'Dic
2022-10-01 09:45:29 -04:00
committed by GitHub
parent 67f6f52abd
commit 33fcab0917
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/server/game/Spells/Spell.cpp
View File

@@ -1468,7 +1468,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
}
tstZ = beforewaterz;
srange = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX));
//TC_LOG_ERROR("server", "(start was from land) step in water , number of cycle = %i , distance of step = %f, total path = %f, Z = %f", j, srange, totalpath, tstZ);
//LOG_ERROR("spells", "(start was from land) step in water , number of cycle = {} , distance of step = {}, total path = {}, Z = {}", j, srange, totalpath, tstZ);
}
}
else if (map->IsInWater(phasemask, tstX, tstY, tstZ, collisionHeight))
@@ -1481,13 +1481,13 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
if (inwater && (fabs(tstZ - ground) < 2.0f))
{
wcol = true;
//TC_LOG_ERROR("server", "step in water with collide and use standart check (for continue way after possible collide), number of cycle = %i ", j);
//LOG_ERROR("spells", "step in water with collide and use standart check (for continue way after possible collide), number of cycle = {} ", j);
}
// if (j < 2)
// TC_LOG_ERROR("server", "(start in water) step in water, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath);
// LOG_ERROR("spells", "(start in water) step in water, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath);
// else
// TC_LOG_ERROR("server", "step in water, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath);
// LOG_ERROR("spells", "step in water, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath);
}
bool IsInWater = map->IsInWater(phasemask, tstX, tstY, tstZ, collisionHeight);
@@ -1505,11 +1505,11 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
//distance of rays, will select the shortest in 3D
srange1 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ1 - prevZ) * (tstZ1 - prevZ));
//TC_LOG_ERROR("server", "step = %i, distance of ray1 = %f", j, srange1);
//LOG_ERROR("spells", "step = {}, distance of ray1 = {}", j, srange1);
srange2 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ2 - prevZ) * (tstZ2 - prevZ));
//TC_LOG_ERROR("server", "step = %i, distance of ray2 = %f", j, srange2);
//LOG_ERROR("spells", "step = {}, distance of ray2 = {}", j, srange2);
srange3 = sqrt((tstY - prevY) * (tstY - prevY) + (tstX - prevX) * (tstX - prevX) + (tstZ3 - prevZ) * (tstZ3 - prevZ));
//TC_LOG_ERROR("server", "step = %i, distance of ray3 = %f", j, srange3);
//LOG_ERROR("spells", "step = {}, distance of ray3 = {}", j, srange3);
if (srange1 < srange2)
{
@@ -1527,7 +1527,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
srange = srange2;
}
//TC_LOG_ERROR("server", "step on ground, number of cycle = %i , distance of step = %f, total path = %f", j, srange, totalpath);
//LOG_ERROR("spells", "step on ground, number of cycle = {} , distance of step = {}, total path = {}", j, srange, totalpath);
}
destx = tstX;
@@ -1539,7 +1539,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
if (totalpath > distance)
{
overdistance = totalpath - distance;
//TC_LOG_ERROR("server", "total path > than distance in 3D , need to move back a bit for save distance, total path = %f, overdistance = %f", totalpath, overdistance);
//LOG_ERROR("spells", "total path > than distance in 3D , need to move back a bit for save distance, total path = {}, overdistance = {}", totalpath, overdistance);
}
bool col = VMAP::VMapFactory::createOrGetVMapMgr()->GetObjectHitPos(mapid, prevX, prevY, prevZ + 0.5f, tstX, tstY, tstZ + 0.5f, tstX, tstY, tstZ, -0.5f);
@@ -1553,14 +1553,14 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
{
destx = prevX + overdistance * cos(pos.GetOrientation());
desty = prevY + overdistance * sin(pos.GetOrientation());
//TC_LOG_ERROR("server", "(collision) collision occured 1");
//LOG_ERROR("spells", "(collision) collision occured 1");
}
else
{
// move back a bit
destx = tstX - (0.6 * cos(pos.GetOrientation()));
desty = tstY - (0.6 * sin(pos.GetOrientation()));
//TC_LOG_ERROR("server", "(collision) collision occured 2");
//LOG_ERROR("spells", "(collision) collision occured 2");
}
// highest available point
@@ -1584,13 +1584,12 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
if (inwater && destz < prevZ && !wcol)
destz = prevZ;
//TC_LOG_ERROR("server", "(collision) destZ rewrited in prevZ");
//LOG_ERROR("spells", "(collision) destZ rewrited in prevZ");
break;
}
// we have correct destz now
}
//}
lastpos.Relocate(destx, desty, destz, pos.GetOrientation());
dest = SpellDestination(lastpos);
@@ -1613,7 +1612,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici
lastpos.Relocate(destx, desty, z, pos.GetOrientation());
dest = SpellDestination(lastpos);
//float range = sqrt((desty - pos.GetPositionY())*(desty - pos.GetPositionY()) + (destx - pos.GetPositionX())*(destx - pos.GetPositionX()));
//TC_LOG_ERROR("server", "Blink number 2, in falling but at a hight, distance of blink = %f", range);
//LOG_ERROR("spells", "Blink number 2, in falling but at a hight, distance of blink = {}", range);
}
break;
}