josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Fix possible exploits with flying paths.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-01 16:18:37 +02:00
parent 6c7e41cf87
commit fd86e6a369
6 changed files with 33 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/BattleGroundHandler.cpp
+2 -1
View File
@@ -448,7 +448,8 @@ void WorldSession::HandleBattleFieldPortOpcode( WorldPacket &recv_data )
if (_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
sBattleGroundMgr.BuildBattleGroundStatusPacket(&data, bg, queueSlot, STATUS_IN_PROGRESS, 0, bg->GetStartTime(), bg->GetArenaType());
src/game/Level1.cpp
+13 -13
View File
@@ -852,7 +852,7 @@ bool ChatHandler::HandleNamegoCommand(const char* args)
if (target->isInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->m_taxi.ClearTaxiDestinations();
target->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -988,7 +988,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
if (_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -1021,7 +1021,7 @@ bool ChatHandler::HandleGonameCommand(const char* args)
if (_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -1055,7 +1055,7 @@ bool ChatHandler::HandleRecallCommand(const char* args)
if(target->isInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->m_taxi.ClearTaxiDestinations();
target->CleanupAfterTaxiFlight();
}
target->TeleportTo(target->m_recallMap, target->m_recallX, target->m_recallY, target->m_recallZ, target->m_recallO);
@@ -2241,7 +2241,7 @@ bool ChatHandler::HandleTeleCommand(const char * args)
if(_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2504,7 +2504,7 @@ bool ChatHandler::HandleTeleNameCommand(const char * args)
if(target->isInFlight())
{
target->GetMotionMaster()->MovementExpired();
target->m_taxi.ClearTaxiDestinations();
target->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2600,7 +2600,7 @@ bool ChatHandler::HandleTeleGroupCommand(const char * args)
if(pl->isInFlight())
{
pl->GetMotionMaster()->MovementExpired();
pl->m_taxi.ClearTaxiDestinations();
pl->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2689,7 +2689,7 @@ bool ChatHandler::HandleGroupgoCommand(const char* args)
if(pl->isInFlight())
{
pl->GetMotionMaster()->MovementExpired();
pl->m_taxi.ClearTaxiDestinations();
pl->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2739,7 +2739,7 @@ bool ChatHandler::HandleGoTaxinodeCommand(const char* args)
if (_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2782,7 +2782,7 @@ bool ChatHandler::HandleGoXYCommand(const char* args)
if(_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2832,7 +2832,7 @@ bool ChatHandler::HandleGoXYZCommand(const char* args)
if(_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2903,7 +2903,7 @@ bool ChatHandler::HandleGoZoneXYCommand(const char* args)
if(_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
@@ -2950,7 +2950,7 @@ bool ChatHandler::HandleGoGridCommand(const char* args)
if(_player->isInFlight())
{
_player->GetMotionMaster()->MovementExpired();
_player->m_taxi.ClearTaxiDestinations();
_player->CleanupAfterTaxiFlight();
}
// save only in non-flight case
else
src/game/Player.cpp
+13 -1
View File
@@ -17230,6 +17230,10 @@ void Player::RestoreSpellMods(Spell * spell)
else
mod->charges++;
// Do not set more spellmods than avalible
if (mod->ownerAura->GetAuraCharges() < mod->charges)
mod->charges = mod->ownerAura->GetAuraCharges();
// Skip this check for now - aura charges may change due to various reason
// TODO: trac these changes correctly
//assert (mod->ownerAura->GetAuraCharges() <= mod->charges);
@@ -17656,6 +17660,14 @@ bool Player::ActivateTaxiPathTo( uint32 taxi_path_id, uint32 spellid /*= 0*/ )
return ActivateTaxiPathTo(nodes,NULL,spellid);
}
void Player::CleanupAfterTaxiFlight()
{
m_taxi.ClearTaxiDestinations(); // not destinations, clear source node
Unmount();
RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
getHostilRefManager().setOnlineOfflineState(true);
}
void Player::ProhibitSpellScholl(SpellSchoolMask idSchoolMask, uint32 unTimeMs )
{
// last check 2.0.10
@@ -19366,7 +19378,7 @@ void Player::SummonIfPossible(bool agree)
if(isInFlight())
{
GetMotionMaster()->MovementExpired();
m_taxi.ClearTaxiDestinations();
CleanupAfterTaxiFlight();
}
// drop flag at summon
src/game/Player.h
+1
View File
@@ -905,6 +905,7 @@ class TRINITY_DLL_SPEC Player : public Unit
void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); }
bool ActivateTaxiPathTo(std::vector<uint32> const& nodes, Creature* npc = NULL, uint32 spellid = 0);
bool ActivateTaxiPathTo(uint32 taxi_path_id, uint32 spellid = 0);
void CleanupAfterTaxiFlight();
// mount_id can be used in scripting calls
bool isAcceptWhispers() const { return m_ExtraFlags & PLAYER_EXTRA_ACCEPT_WHISPERS; }
void SetAcceptWhispers(bool on) { if(on) m_ExtraFlags |= PLAYER_EXTRA_ACCEPT_WHISPERS; else m_ExtraFlags &= ~PLAYER_EXTRA_ACCEPT_WHISPERS; }
src/game/Spell.cpp
+3 -2
View File
@@ -3278,9 +3278,10 @@ void Spell::finish(bool ok)
}
// potions disabled by client, send event "not in combat" if need
if (!m_triggeredByAuraSpell && m_caster->GetTypeId() == TYPEID_PLAYER)
if (m_caster->GetTypeId() == TYPEID_PLAYER)
{
((Player*)m_caster)->UpdatePotionCooldown(this);
if (!m_triggeredByAuraSpell)
((Player*)m_caster)->UpdatePotionCooldown(this);
// triggered spell pointer can be not set in some cases
// this is needed for proper apply of triggered spell mods
src/game/TaxiHandler.cpp
+1 -4
View File
@@ -256,11 +256,8 @@ void WorldSession::HandleMoveSplineDoneOpcode(WorldPacket& /*recv_data*/)
return;
}
GetPlayer()->m_taxi.ClearTaxiDestinations(); // not destinations, clear source node
GetPlayer()->Unmount();
GetPlayer()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE | UNIT_FLAG_TAXI_FLIGHT);
GetPlayer()->CleanupAfterTaxiFlight();
GetPlayer()->SetFallInformation(0, GetPlayer()->GetPositionZ());
GetPlayer()->getHostilRefManager().setOnlineOfflineState(true);
if(GetPlayer()->pvpInfo.inHostileArea)
GetPlayer()->CastSpell(GetPlayer(), 2479, true);
}