mirror of
https://github.com/mod-playerbots/mod-playerbots.git
synced 2026-01-23 05:26:22 +00:00
As requested revert for threadfixes last few days (#1552)
* Revert "[Large server fix] #1537 Serialize playerBots/botLoading with a mutex and use snapshot-based loops to fix concurrency crashes (#1540)" This reverts commit3fff58df1a. * Revert "[Fix] teleport to invalid map or invalid coordinates (x , y , z 200000, o ) given when teleporting player (g UI d full type player low , name , map , x , y , z , o ) (#1538)" This reverts commitca2e2ef0db. * Revert "Fix: prevent MoveSplineInitArgs::Validate velocity asserts (velocity > 0.01f) for bots, pets, and charmed units (#1534)" This reverts commit4e3ac609bd. * Revert "[Fix issue #1527] : startup crash in tank target selection — add TOCTOU & null-safety guards (#1532)" This reverts commitc6b0424c29. * Revert "[Fix issue #1528] Close small window where the “in a BG/arena” state can change between the check (InBattleground() / InArena()) and grabbing the pointer (GetBattleground()), which leads to a null dereference. (#1530)" This reverts commit2e0a161623. * Revert "Harden playerbot logout & packet dispatch; add null-safety in chat hooks and RPG checks (#1529)" This reverts commite4ea8e2694. * Revert "Dont wait to travel when in combat. (#1524)" This reverts commitddfa919154. * Revert "nullptr fix (#1523)" This reverts commit380312ffd2. * Revert "Playerbots/LFG: fix false not eligible & dungeon 0/type 0, add clear diagnostics (#1521)" This reverts commit872e417613. * Revert "nullptr exception (#1520)" This reverts commit3d28a81508. * Revert "Removed bot freezing at startup and system message, not relevant anymore (#1519)" This reverts commitbcd6f5bc06.
This commit is contained in:
@@ -49,46 +49,4 @@ int strcmpi(char const* s1, char const* s2);
|
||||
#define GAI_VALUE(type, name) sSharedValueContext->getGlobalValue<type>(name)->Get()
|
||||
#define GAI_VALUE2(type, name, param) sSharedValueContext->getGlobalValue<type>(name, param)->Get()
|
||||
|
||||
// ---- Safe teleport wrappers (module-only) ----
|
||||
#include "Map.h"
|
||||
#include <cmath>
|
||||
#include "TravelMgr.h"
|
||||
|
||||
inline bool TeleportToSafe(Player* p, uint32 mapId, float x, float y, float z, float o)
|
||||
{
|
||||
if (!p) return false;
|
||||
|
||||
// If the height is invalid (-200000) or not finite, attempt ONE correction on the same map.
|
||||
if (z <= -199000.0f || !std::isfinite(z))
|
||||
{
|
||||
if (p->GetMapId() == mapId && p->GetMap())
|
||||
{
|
||||
float hz = p->GetMap()->GetHeight(p->GetPhaseMask(), x, y, p->GetPositionZ(), true);
|
||||
if (hz > -199000.0f && std::isfinite(hz))
|
||||
z = hz;
|
||||
else
|
||||
return false; // still invalid -> cancel the TP
|
||||
}
|
||||
else
|
||||
{
|
||||
return false; // different map: do not "guess" the height here
|
||||
}
|
||||
}
|
||||
return p->TeleportTo(mapId, x, y, z, o);
|
||||
}
|
||||
|
||||
inline bool TeleportToSafe(Player* p, Position const& pos)
|
||||
{
|
||||
// Position doesn't have mapId: we keep actual bot map
|
||||
return TeleportToSafe(p, p->GetMapId(),
|
||||
pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(),
|
||||
pos.GetOrientation());
|
||||
}
|
||||
|
||||
inline bool TeleportToSafe(Player* p, WorldPosition pos)
|
||||
{
|
||||
return TeleportToSafe(p, pos.getMapId(), pos.getX(), pos.getY(), pos.getZ(), pos.getO());
|
||||
}
|
||||
// ---- /Safe teleport wrappers ----
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user