mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit 'origin/master' into 320

Browse source
This commit is contained in:
tomrus88 2009-07-31 01:07:17 +04:00
commit 1d5b9f18f3
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Map.cpp
View file

@ -483,6 +483,7 @@ void Map::MessageBroadcast(Player *player, WorldPacket *msg, bool to_self)
Cell cell(p); Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
return; return;
@ -528,6 +529,7 @@ void Map::MessageDistBroadcast(Player *player, WorldPacket *msg, float dist, boo
Cell cell(p); Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT; cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) ) if( !loaded(GridPair(cell.data.Part.grid_x, cell.data.Part.grid_y)) )
return; return;

14
src/game/SpellMgr.cpp
View file

@ -172,7 +172,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
return SPELL_STING; return SPELL_STING;
// only hunter aspects have this (but not all aspects in hunter family) // only hunter aspects have this (but not all aspects in hunter family)
if( spellInfo->SpellFamilyFlags & UI64LIT(0x0044000000380000) || spellInfo->SpellFamilyFlags2 & 0x00003010) if( spellInfo->SpellFamilyFlags & UI64LIT(0x0044000000380000) || spellInfo->SpellFamilyFlags2 & 0x00001010)
return SPELL_ASPECT; return SPELL_ASPECT;
if( spellInfo->SpellFamilyFlags2 & 0x00000002 ) if( spellInfo->SpellFamilyFlags2 & 0x00000002 )
@ -191,12 +191,10 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
if ((spellInfo->SpellFamilyFlags & UI64LIT(0x00000820180400)) && (spellInfo->AttributesEx3 & 0x200)) if ((spellInfo->SpellFamilyFlags & UI64LIT(0x00000820180400)) && (spellInfo->AttributesEx3 & 0x200))
return SPELL_JUDGEMENT; return SPELL_JUDGEMENT;
for (int i = 0; i < 3; ++i) // only paladin auras have this (for palaldin class family)
{ if( spellInfo->SpellFamilyFlags2 & 0x00000020 )
// only paladin auras have this (for palaldin class family) return SPELL_AURA;
if (spellInfo->Effect[i] == SPELL_EFFECT_APPLY_AREA_AURA_RAID)
return SPELL_AURA;
}
break; break;
} }
case SPELLFAMILY_SHAMAN: case SPELLFAMILY_SHAMAN:
@ -211,7 +209,7 @@ SpellSpecific GetSpellSpecific(uint32 spellId)
return spellmgr.GetSpellElixirSpecific(spellInfo->Id); return spellmgr.GetSpellElixirSpecific(spellInfo->Id);
case SPELLFAMILY_DEATHKNIGHT: case SPELLFAMILY_DEATHKNIGHT:
if ((spellInfo->Attributes & 0x10) && (spellInfo->AttributesEx2 & 0x10) && (spellInfo->AttributesEx4 & 0x200000)) if (spellInfo->Category == 47)
return SPELL_PRESENCE; return SPELL_PRESENCE;
break; break;
} }

4
src/game/WorldSocket.cpp
View file

@ -755,7 +755,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
BigNumber K; BigNumber K;
if (recvPacket.size () < (4 + 4 + 1 + 4 + 20)) if (recvPacket.size () < (4 + 4 + 1 + 4 + 4 + 20))
{ {
sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size"); sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size");
return -1; return -1;
@ -767,7 +767,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
recvPacket >> account; recvPacket >> account;
recvPacket >> unk3; recvPacket >> unk3;
if (recvPacket.size () < (4 + 4 + (account.size () + 1) + 4 + 20)) if (recvPacket.size () < (4 + 4 + (account.size () + 1) + 4 + 4 + 20))
{ {
sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size second check"); sLog.outError ("WorldSocket::HandleAuthSession: wrong packet size second check");
return -1; return -1;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8277" #define REVISION_NR "8280"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__