Merge branch 'master' of github.com:azerothcore/azerothcore-wotlk

This commit is contained in:
Yehonal
2016-08-14 12:59:14 +02:00
4 changed files with 16 additions and 9 deletions

View File

@@ -12,13 +12,15 @@ It is written in C++ and based on MaNGOS, TrinityCore and SunwellCore.
Our main goal is to create a playable game server, offering a fully working game experience. In short, we focus on the **user experience (UX)**.
Like MaNGOS and TrinityCore did in past, we like to write clean code and doing software development right, but **our main goal is to have fully working features**. In other terms, we always prefer proper solutions to problems, but we may accept "*hackfixes*" (when they do not affect the game stability) if a proper solution is not available yet.
We also believe in [software modularity](https://en.wikipedia.org/wiki/Modular_programming), because the more the software is modular, and the more it will be easy to be maintained, understood, developed, etc... So we organized the structure of AzerothCore as modular as possible, giving the possibility to [create new modules](https://github.com/azerothcore/azerothcore-wotlk/wiki/Create-a-Module) to add custom features (instead of patching the core).
We also believe in [software modularity](https://en.wikipedia.org/wiki/Modular_programming), because the more the software is modular, and the more it will be easy to be maintained, understood, developed, etc...
## Learning project
## Work in progress...
AzerothCore is a learning project.
If you want to learn how to use C++, SQL, git, etc... you came to the right place! We will gladly to help you: **programming is our passion**.
If you want to contribute, in [our wiki](https://github.com/azerothcore/azerothcore-wotlk/wiki) you fill find a lot of resources that will guide you. Also you can poke us in [our gitter chat channel](https://gitter.im/azerothcore/azerothcore).
The project is still under a work in progress phase, so all guidelines may not be available yet and PRs may be not merged immediately, but feel free to starting contributing. We will love to review and accept your PRs.
## Authors & Contributors

View File

@@ -1,4 +1,9 @@
AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
unamestr=`uname`
if [[ "$unamestr" == 'Darwin' ]]; then
AC_PATH_ROOT=$(greadlink -f "$AC_PATH_BIN/../")
else
AC_PATH_ROOT=$(readlink -f "$AC_PATH_BIN/../")
fi
AC_PATH_CONF="$AC_PATH_ROOT/conf"

View File

@@ -9,9 +9,9 @@ DROP TABLE IF EXISTS `battleground_deserters`;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `battleground_deserters`
(
`guid` int(10) unsigned NOT NULL COMMENT 'characters.guid',
`type` tinyint(3) unsigned NOT NULL COMMENT 'type of the desertion',
`datetime` datetime NOT NULL COMMENT 'datetime of the desertion'
`guid` INT(10) UNSIGNED NOT NULL COMMENT 'characters.guid',
`type` TINYINT(3) UNSIGNED NOT NULL COMMENT 'type of the desertion',
`datetime` DATETIME NOT NULL COMMENT 'datetime of the desertion'
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;

View File

@@ -410,7 +410,7 @@ void WorldSession::HandleLogoutRequestOpcode(WorldPacket & /*recv_data*/)
if (uint64 lguid = GetPlayer()->GetLootGUID())
DoLootRelease(lguid);
bool instantLogout = (GetSecurity() > SEC_PLAYER || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight();
bool instantLogout = (GetSecurity() >= sWorld->getIntConfig(CONFIG_INSTANT_LOGOUT) || GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && !GetPlayer()->IsInCombat()) || GetPlayer()->IsInFlight();
/// TODO: Possibly add RBAC permission to log out in combat
bool canLogoutInCombat = GetPlayer()->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);