diff options
| author | Shauren <shauren.trinity@gmail.com> | 2013-09-01 00:59:58 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2013-09-01 00:59:58 +0200 |
| commit | d6fdd05493aaa8600b07eb17dfee222a8379b033 (patch) | |
| tree | 434b440bc5e5ddfd4ec7d7b48ab54839d2d2f5b9 /src/server/game | |
| parent | 6c8d0e5405a4def3be80c6c4be0abc156a34b031 (diff) | |
| parent | 1bbd726e88260bb2904698317cd8d665d670ac0b (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Accounts/RBAC.h | 6 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index 55f8527a125..be4356f6b54 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -154,6 +154,12 @@ enum RBACPermissions RBAC_PERM_COMMAND_UNBAN_CHARACTER = 254,
RBAC_PERM_COMMAND_UNBAN_IP = 255,
RBAC_PERM_COMMAND_UNBAN_PLAYERACCOUNT = 256,
+ RBAC_PERM_COMMAND_BF = 257,
+ RBAC_PERM_COMMAND_BF_START = 258,
+ RBAC_PERM_COMMAND_BF_STOP = 259,
+ RBAC_PERM_COMMAND_BF_SWITCH = 260,
+ RBAC_PERM_COMMAND_BF_TIMER = 261,
+ RBAC_PERM_COMMAND_BF_ENABLE = 262,
// custom permissions 1000+
RBAC_PERM_MAX
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 995e44a6037..15cb32113dd 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -524,7 +524,6 @@ int WorldSocket::handle_input_payload (void) m_RecvPct.base (NULL, 0); m_RecvPct.reset(); - delete m_RecvWPct; m_RecvWPct = NULL; m_Header.reset(); |