Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Conflicts:
	src/server/game/World/World.cpp
	src/server/worldserver/worldserver.conf.dist
This commit is contained in:
Vincent_Michael committed 2013-01-07 16:57:39 +01:00
commit b69dff28db
26 files changed
+1006 -538

No files matched your search

@@ -338,6 +338,8 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags
}
else if (spellFlags & SPELL_DISABLE_DEPRECATED_SPELL) // call not from spellcast
return true;
else if (flags & SPELL_DISABLE_LOS)
return spellFlags & SPELL_DISABLE_LOS;
break;
}