diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-24 18:26:52 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-24 18:26:52 +0200 |
| commit | f0c366141b4e8fa9c36f4aa4b1050efa06659347 (patch) | |
| tree | e25e37d55a8344984e9606f7f67a7c69d2bb3d38 /src/server/scripts/World | |
| parent | 1ed38faeac836c85efcd9574939939ae861c24e8 (diff) | |
| parent | 7f0d283599a81c9272a5b29ed5d745c22e0b226e (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/scripts/World/action_ip_logger.cpp
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/action_ip_logger.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/server/scripts/World/action_ip_logger.cpp b/src/server/scripts/World/action_ip_logger.cpp index 73d92fb631a..057f3d6ee36 100644 --- a/src/server/scripts/World/action_ip_logger.cpp +++ b/src/server/scripts/World/action_ip_logger.cpp @@ -49,39 +49,39 @@ class AccountActionIpLogger : public AccountScript // We log last_ip instead of last_attempt_ip, as login was successful // ACCOUNT_LOGIN = 0 - void OnAccountLogin(uint32 accountId) + void OnAccountLogin(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_LOGIN); } // We log last_attempt_ip instead of last_ip, as failed login doesn't necessarily mean approperiate user // ACCOUNT_FAIL_LOGIN = 1 - void OnFailedAccountLogin(uint32 accountId) + void OnFailedAccountLogin(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_FAIL_LOGIN); } // ACCOUNT_CHANGE_PW = 2 - void OnPasswordChange(uint32 accountId) + void OnPasswordChange(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW); } // ACCOUNT_CHANGE_PW_FAIL = 3 - void OnFailedPasswordChange(uint32 accountId) + void OnFailedPasswordChange(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_CHANGE_PW_FAIL); } // Registration Email can NOT be changed apart from GM level users. Thus, we do not require to log them... - // ACCOUNT_CHANGE_EMAIL = 4 - void OnEmailChange(uint32 accountId) + // ACCOUNT_CHANGE_EMAIL = 4 + void OnEmailChange(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL); // ... they get logged by gm command logger anyway } // ACCOUNT_CHANGE_EMAIL_FAIL = 5 - void OnFailedEmailChange(uint32 accountId) + void OnFailedEmailChange(uint32 accountId) override { AccountIPLogAction(accountId, ACCOUNT_CHANGE_EMAIL_FAIL); } @@ -168,19 +168,19 @@ class CharacterActionIpLogger : public PlayerScript CharacterActionIpLogger() : PlayerScript("CharacterActionIpLogger") { } // CHARACTER_CREATE = 7 - void OnCreate(Player* player) + void OnCreate(Player* player) override { CharacterIPLogAction(player, CHARACTER_CREATE); } // CHARACTER_LOGIN = 8 - void OnLogin(Player* player, bool /*firstLogin*/) + void OnLogin(Player* player, bool /*firstLogin*/) override { CharacterIPLogAction(player, CHARACTER_LOGIN); } // CHARACTER_LOGOUT = 9 - void OnLogout(Player* player) + void OnLogout(Player* player) override { CharacterIPLogAction(player, CHARACTER_LOGOUT); } @@ -252,13 +252,13 @@ public: CharacterDeleteActionIpLogger() : PlayerScript("CharacterDeleteActionIpLogger") { } // CHARACTER_DELETE = 10 - void OnDelete(uint64 guid, uint32 accountId) + void OnDelete(uint64 guid, uint32 accountId) override { DeleteIPLogAction(guid, accountId, CHARACTER_DELETE); } // CHARACTER_FAILED_DELETE = 11 - void OnFailedDelete(uint64 guid, uint32 accountId) + void OnFailedDelete(uint64 guid, uint32 accountId) override { DeleteIPLogAction(guid, accountId, CHARACTER_FAILED_DELETE); } |