--- Index: src/game/MovementHandler.cpp
===================================================================
--- src/game/MovementHandler.cpp (revision 4609)
+++ src/game/MovementHandler.cpp (working copy)
@@ -27,6 +27,7 @@
#include "MapManager.h"
#include "Transports.h"
#include "BattleGroundMgr.h"
+#include "NameTables.h"
void WorldSession::HandleMoveWorldportAckOpcode( WorldPacket & recv_data )
{
@@ -124,6 +125,8 @@
float s_angle;
float j_unk1, j_sinAngle, j_cosAngle, j_xyspeed;
float u_unk1;
+ uint32 m_flags = GetPlayer()->GetMovementFlags();
+ uint16 opcode = recv_data.GetOpcode();
recv_data >> flags >> time;
recv_data >> x >> y >> z >> orientation;
@@ -174,52 +177,63 @@
if (flags & MOVEMENTFLAG_ONTRANSPORT)
{
// if we boarded a transport, add us to it
- if (!GetPlayer()->m_transport)
+ if ((GetPlayer()->m_transportGUID == 0) && (t_GUID !=0))
{
- // unmount before boarding
- _player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
+ if (!GetPlayer()->m_transport)
+ {
+ // unmount before boarding
+ _player->RemoveSpellsCausingAura(SPELL_AURA_MOUNTED);
- for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
- {
- if ((*iter)->GetGUID() == t_GUID)
+ for (MapManager::TransportSet::iterator iter = MapManager::Instance().m_Transports.begin(); iter != MapManager::Instance().m_Transports.end(); ++iter)
{
- GetPlayer()->m_transport = (*iter);
- (*iter)->AddPassenger(GetPlayer());
- break;
+ if ((*iter)->GetGUID() == t_GUID)
+ {
+ GetPlayer()->m_transport = (*iter);
+ (*iter)->AddPassenger(GetPlayer());
+ break;
+ }
}
}
+ GetPlayer()->m_transportGUID = t_GUID;
}
- GetPlayer()->m_transX = t_x;
- GetPlayer()->m_transY = t_y;
- GetPlayer()->m_transZ = t_z;
- GetPlayer()->m_transO = t_o;
- GetPlayer()->m_transTime = t_time;
+ if (t_GUID !=0)
+ {
+ GetPlayer()->m_transX = t_x;
+ GetPlayer()->m_transY = t_y;
+ GetPlayer()->m_transZ = t_z;
+ GetPlayer()->m_transO = t_o;
+ GetPlayer()->m_transTime = t_time;
+ }
}
- else if (GetPlayer()->m_transport) // if we were on a transport, leave
+ else if (GetPlayer()->m_transportGUID != 0)
{
- GetPlayer()->m_transport->RemovePassenger(GetPlayer());
- GetPlayer()->m_transport = NULL;
+ if (GetPlayer()->m_transport) // if we were on a transport, leave
+ {
+ GetPlayer()->m_transport->RemovePassenger(GetPlayer());
+ GetPlayer()->m_transport = NULL;
+ }
GetPlayer()->m_transX = 0.0f;
GetPlayer()->m_transY = 0.0f;
GetPlayer()->m_transZ = 0.0f;
GetPlayer()->m_transO = 0.0f;
GetPlayer()->m_transTime = 0;
+ GetPlayer()->m_transportGUID = 0;
}
- if (GetPlayer()->HasMovementFlags(MOVEMENTFLAG_FALLING) && !(flags & MOVEMENTFLAG_FALLING))
+ if (opcode == MSG_MOVE_FALL_LAND)
{
Player *target = GetPlayer();
+ uint32 safefallTime = (GetPlayer()->HasAuraType(SPELL_AURA_SAFE_FALL)) ? 17000 : 0; // -17 modifier to fall damage at safe fall aura (from wowwiki.com)
+ //sLog.outBasic("Fall time: %d; SafeTime: %d",fallTime, safefallTime);
+ fallTime = (fallTime > safefallTime) ? (fallTime - safefallTime) : 0;
if (fallTime > 1100 && !target->isDead() && !target->isGameMaster() &&
!target->HasAuraType(SPELL_AURA_HOVER) && !target->HasAuraType(SPELL_AURA_FEATHER_FALL))
{
- Map *map = MapManager::Instance().GetMap(target->GetMapId(), target);
- float posz = map->GetWaterLevel(x,y);
float fallperc = float(fallTime)*10/11000;
uint32 damage = (uint32)(((fallperc*fallperc -1) / 9 * target->GetMaxHealth())*sWorld.getRate(RATE_DAMAGE_FALL));
if (damage > 0 && damage < 2* target->GetMaxHealth())
target->EnvironmentalDamage(target->GetGUID(),DAMAGE_FALL, damage);
- DEBUG_LOG("!! z=%f, pz=%f FallTime=%d posz=%f damage=%d" , z, target->GetPositionZ(),fallTime, posz, damage);
}
//handle fall and logout at the sametime
@@ -238,16 +252,117 @@
if(((flags & MOVEMENTFLAG_SWIMMING) != 0) != GetPlayer()->IsInWater())
GetPlayer()->SetInWater( !GetPlayer()->IsInWater() );
/*----------------------*/
+ // ---- anti-cheat features -->>>
+ bool kicked = true;
+ if ((GetPlayer()->m_transportGUID == 0) && !GetPlayer()->isTaxi() && sWorld.GetEnableMovementAnticheat())
+ {
+ UnitMoveType move_type;
+
+ if (flags & MOVEMENTFLAG_FLYING) move_type = flags & MOVEMENTFLAG_BACKWARD ? MOVE_FLYBACK : MOVE_FLY;
+ else if (flags & MOVEMENTFLAG_SWIMMING) move_type = flags & MOVEMENTFLAG_BACKWARD ? MOVE_SWIMBACK : MOVE_SWIM;
+ else if (flags & MOVEMENTFLAG_WALK) move_type = MOVE_WALK;
+ else move_type = flags & MOVEMENTFLAG_BACKWARD ? MOVE_SWIMBACK : MOVE_RUN;
+ //hmm... in first time after login player has MOVE_SWIMBACK instead MOVE_WALKBACK
+ float c_speed = 0;
+ float cur_speed = GetPlayer()->GetSpeed(move_type);
+ float delta_x = GetPlayer()->GetPositionX() - x;
+ float delta_y = GetPlayer()->GetPositionY() - y;
+ float delta_z = GetPlayer()->GetPositionZ() - z;
+ float delta = delta_x * delta_x + delta_y * delta_y;
+ float tg_z = -99999; //tangens
+ float delta_t = time - GetPlayer()->m_lastmovetime;
+ if (delta_t > 0) {
+ GetPlayer()->m_lastmovetime = time;
+ } else {delta_t = 0;}
+ delta_t = (delta_t < 1500) ? delta_t/1000 : 1.5;
+ if (!(flags & (MOVEMENTFLAG_FLYING | MOVEMENTFLAG_SWIMMING)))
+ tg_z = (delta !=0) ? delta_z*delta_z / delta : -99999;
+
+ if (cur_speed < GetPlayer()->m_lastspeed)
+ {
+ c_speed = GetPlayer()->m_lastspeed;
+ if (GetPlayer()->m_lastspeed_changetime == 0 )
+ GetPlayer()->m_lastspeed_changetime = time + (uint32)floor(((GetPlayer()->m_lastspeed / cur_speed) * 1000));
+ } else c_speed = cur_speed;
+
+ c_speed = c_speed * delta_t;
+ c_speed = c_speed * c_speed + 1.5;
+
+ //static char const* move_type_name[MAX_MOVE_TYPE] = { "Walk", "Run", "Walkback", "Swim", "Swimback", "Turn", "Fly", "Flyback" };
+ //sLog.outBasic("%s newcoord: tm:%d ftm:%d | %f,%f,%fo(%f) [%X][%s]$%s",GetPlayer()->GetName(),time,fallTime,x,y,z,orientation,flags, LookupName(opcode,g_worldOpcodeNames),move_type_name[move_type]);
+ //sLog.outBasic("%f",tg_z);
+
+ if ((delta > c_speed) && (delta_z < 1))
+ {
+ //sLog.outError("Ahhaaa.... %s is speed cheater!!! delta=%f c_speed=%f | cur_speed=%f last_speed=%f time=%f (%f %f %f %d)[%s]",GetPlayer()->GetName(),delta, c_speed, cur_speed, GetPlayer()->m_lastspeed,delta_t,GetPlayer()->GetPositionX(),GetPlayer()->GetPositionY(),GetPlayer()->GetPositionZ(), GetPlayer()->GetMapId(),LookupName(opcode,g_worldOpcodeNames));
+ kicked = false;
+ }
+ if ((delta>4900.0f) && !(delta < c_speed))
+ {
+ //sLog.outError("Ahhaaa.... %s is teleport cheater!!! delta=%f c_speed=%f | cur_speed=%f last_speed=%f time=%f (%f %f %f %d)",GetPlayer()->GetName(),delta, c_speed, cur_speed, GetPlayer()->m_lastspeed,delta_t,GetPlayer()->GetPositionX(),GetPlayer()->GetPositionY(),GetPlayer()->GetPositionZ(), GetPlayer()->GetMapId());
+ kicked = false;
+ }
+
+ if (time>GetPlayer()->m_lastspeed_changetime)
+ {
+ GetPlayer()->m_lastspeed = cur_speed; // store current speed
+ if (GetPlayer()->m_lastspeed_changetime != 0) GetPlayer()->m_lastspeed_changetime = 0;
+ }
+
+ if ((tg_z > 1.55f) && (delta_z < -2.6f))
+ {
+ // sLog.outError("Ahhaaa.... %s is mountain cheater!!! tg_z=%f (%f %f %f %d)",GetPlayer()->GetName(),tg_z, GetPlayer()->GetPositionX(),GetPlayer()->GetPositionY(),GetPlayer()->GetPositionZ(), GetPlayer()->GetMapId());
+ kicked = false;
+ }
+ if (((flags & (MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_FLYING)) != 0) && !GetPlayer()->isGameMaster() && !(GetPlayer()->HasAuraType(SPELL_AURA_MOD_SPEED_MOUNTED_FLIGHT) | GetPlayer()->HasAuraType(SPELL_AURA_FLY)))
+ {
+ // sLog.outError("Ahhaaa.... %s is fly cheater!!! SPELL_AURA_FLY=[%X]| SPELL_AURA_MOD_SPEED_MOUNTED_FLIGHT=[%X]", GetPlayer()->GetName(), GetPlayer()->HasAuraType(SPELL_AURA_FLY), GetPlayer()->HasAuraType(SPELL_AURA_MOD_SPEED_MOUNTED_FLIGHT));
+ kicked = false;
+ }
+ if (((flags & MOVEMENTFLAG_WATERWALKING) != 0) && !GetPlayer()->isGameMaster() && !(GetPlayer()->HasAuraType(SPELL_AURA_WATER_WALK) | GetPlayer()->HasAuraType(SPELL_AURA_GHOST)))
+ {
+ // sLog.outError("Ahhaaa.... %s is water-walk cheater!!! SPELL_AURA_WATER_WALK=[%X]", GetPlayer()->GetName(), GetPlayer()->HasAuraType(SPELL_AURA_WATER_WALK));
+ kicked = false;
+ }
下页继续
