josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
This commit is contained in:
Vincent-Michael
2013-07-23 02:03:35 +02:00
parent 41ebf1493c 5463f211b4
commit aca68428c2
27 changed files with 241 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Commands/cs_misc.cpp
+4 -8
View File
@@ -654,11 +654,9 @@ public:
return false;
}
if (target->GetTypeId() == TYPEID_PLAYER)
{
if (handler->HasLowerSecurity((Player*)target, 0, false))
if (Player* player = target->ToPlayer())
if (handler->HasLowerSecurity(player, 0, false))
return false;
}
if (target->IsAlive())
{
@@ -2226,11 +2224,9 @@ public:
return false;
}
if (target->GetTypeId() == TYPEID_PLAYER)
{
if (handler->HasLowerSecurity((Player*)target, 0, false))
if (Player* player = target->ToPlayer())
if (handler->HasLowerSecurity(player, 0, false))
return false;
}
if (!target->IsAlive())
return true;