Changeset 118 for trunk/src/game/Map.cpp

Show
Ignore:
Timestamp:
11/19/08 13:37:52 (17 years ago)
Author:
yumileroy
Message:

[svn] Make mobs scatter around in melee attack. Patch provided by smellbee.
Fix Join Instance Can Enter while Encounter is in Progress. Patch provided by mknjc.

Original author: megamage
Date: 2008-10-27 08:00:33-05:00

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/game/Map.cpp

    r102 r118  
    14201420bool InstanceMap::CanEnter(Player *player) 
    14211421{ 
     1422    if(!player->isGameMaster() && i_data && i_data->IsEncounterInProgress()) 
     1423    { 
     1424        sLog.outDebug("InstanceMap::CanEnter - Player '%s' can't enter instance '%s' while an encounter is in progress.", player->GetName(), GetMapName()); 
     1425        player->SendTransferAborted(GetId(), TRANSFER_ABORT_ZONE_IN_COMBAT); 
     1426        return false; 
     1427    } 
     1428 
    14221429    if(std::find(i_Players.begin(),i_Players.end(),player)!=i_Players.end()) 
    14231430    {