Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Fix merge

Browse Source
This commit is contained in:
Carbenium committed 2015-07-21 20:40:21 +02:00
1 parent 79eb80dcba
commit 2530db5a51
3 files changed
+7 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/game/Accounts/AccountMgr.cpp
+1 -1
View File
@@ -446,7 +446,7 @@ void AccountMgr::LoadRBAC()
while (result->NextRow());
TC_LOG_DEBUG("rbac", "AccountMgr::LoadRBAC: Loading default permissions");
result = LoginDatabase.PQuery("SELECT secId, permissionId FROM rbac_default_permissions WHERE (realmId = %u OR realmId = -1) ORDER BY secId ASC", realmID);
result = LoginDatabase.PQuery("SELECT secId, permissionId FROM rbac_default_permissions WHERE (realmId = %u OR realmId = -1) ORDER BY secId ASC", realmHandle.Index);
if (!result)
{
TC_LOG_INFO("server.loading", ">> Loaded 0 default permission definitions. DB table `rbac_default_permissions` is empty.");
src/server/game/Conditions/ConditionMgr.cpp
+2 -1
View File
@@ -2028,6 +2028,8 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
TC_LOG_ERROR("sql.sql", "%s has non existing world state in value1 (%u), skipped.", cond->ToString(true).c_str(), cond->ConditionValue1);
return false;
}
break;
}
case CONDITION_PHASEID:
{
if (!sPhaseStore.LookupEntry(cond->ConditionValue1))
@@ -2084,7 +2086,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
}
case CONDITION_INSTANCE_INFO:
case CONDITION_AREAID:
case CONDITION_PHASEMASK:
case CONDITION_ALIVE:
break;
default:
src/server/game/Server/WorldSession.cpp
+4 -4
View File
@@ -324,7 +324,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater)
while (m_Socket && !_recvQueue.empty() && _recvQueue.peek(true) != firstDelayedPacket && _recvQueue.next(packet, updater))
{
if (packet->GetOpcode() >= NUM_MSG_TYPES)
if (packet->GetOpcode() >= NUM_OPCODE_HANDLERS)
{
TC_LOG_ERROR("network.opcode", "Received non-existed opcode %s from %s", GetOpcodeNameForLogging(packet->GetOpcode()).c_str()
, GetPlayerInfo().c_str());
@@ -332,7 +332,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater)
}
else
{
OpcodeHandler& opHandle = opcodeTable[packet->GetOpcode()];
OpcodeHandler const* opHandle = opcodeTable[packet->GetOpcode()];
try
{
switch (opHandle->Status)
@@ -359,7 +359,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater)
else if (_player->IsInWorld() && AntiDOS.EvaluateOpcode(*packet, currentTime))
{
sScriptMgr->OnPacketReceive(this, *packet);
(this->*opHandle.handler)(*packet);
(this->*opHandle->Handler)(*packet);
LogUnprocessedTail(packet);
}
// lag can cause STATUS_LOGGEDIN opcodes to arrive after the player started a transfer
@@ -404,7 +404,7 @@ bool WorldSession::Update(uint32 diff, PacketFilter& updater)
if (AntiDOS.EvaluateOpcode(*packet, currentTime))
{
sScriptMgr->OnPacketReceive(this, *packet);
(this->*opHandle->Handler)(*packet);
(this->*opHandle->Handler)(*packet);
LogUnprocessedTail(packet);
}
break;