nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-04 03:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source 
# Conflicts:
#	src/server/game/Entities/Creature/Creature.cpp
#	src/server/game/Entities/Creature/Creature.h
#	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
This commit is contained in:
郑佩茹
2022-07-27 09:11:50 -06:00
parent 27300e9fdf bad616c68a
commit 6ad65508af
140 changed files with 6677 additions and 4753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/game/Maps/Map.cpp
View File

@@ -2965,6 +2965,11 @@ bool InstanceMap::AddPlayerToMap(Player* player)
return false;
}
}
else if (player->GetSession()->PlayerLoading() && playerBind && playerBind->save != mapSave)
{
// Prevent "Convert to Raid" exploit to reset instances
return false;
}
else
{
playerBind = sInstanceSaveMgr->PlayerBindToInstance(player->GetGUID(), mapSave, false, player);

1
src/server/game/Maps/ZoneScript.h
View File

@@ -39,6 +39,7 @@ public:
virtual void OnGameObjectRemove(GameObject*) { }
virtual void OnUnitDeath(Unit*) { }
virtual void OnCreatureEvade(Creature*) { }
//All-purpose data storage 64 bit
virtual ObjectGuid GetGuidData(uint32 /*DataId*/) const { return ObjectGuid::Empty; }