Changeset 34 for trunk/src/game/MiscHandler.cpp

Timestamp:

11/19/08 13:25:37 (17 years ago)

Author:

yumileroy

Message:

[svn] * Removing useless data accidentally committed.
* Applying ImpConfig? patch.
* Note: QUEUE_FOR_GM currently disabled as it's not compatible with the ACE patch. Anyone care to rewrite it?
* Note2: This is untested - I may have done some mistakes here and there. Will try to compile now.

Original author: XTZGZoReX
Date: 2008-10-10 13:37:21-05:00

Files:

• trunk/src/game/MiscHandler.cpp (modified) (2 diffs)

trunk/src/game/MiscHandler.cpp

@@ -296 +296 @@
     }
 
-    //instant logout in taverns/cities or on taxi
-    if(GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight())
+    //instant logout in taverns/cities or on taxi or if its enabled in mangosd.conf
+    if(GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) || GetPlayer()->isInFlight() || sWorld.getConfig(CONFIG_INSTANT_LOGOUT))
     {
         LogoutPlayer(true);
@@ -575 +575 @@
     if(newZone != _player->GetZoneId())
         GetPlayer()->SendInitWorldStates();                 // only if really enters to new zone, not just area change, works strange...
+
+        // AntiCheat.GMIsland
+        if(sWorld.getConfig(CONFIG_KICK_FROM_GMISLAND))
+        {
+                if(newZone == 876 && GetPlayer()->GetSession()->GetSecurity() == SEC_PLAYER)
+                        _player->TeleportTo(13,0,0,0,0);
+        }
 
     GetPlayer()->UpdateZone(newZone);