mirror of
https://github.com/mangosfour/server.git
synced 2025-12-16 04:37:00 +00:00
Merge commit 'origin/master' into 310
Conflicts: src/game/Player.cpp src/game/SpellAuras.cpp
This commit is contained in:
commit
cffbb8661b
44 changed files with 389 additions and 181 deletions
|
|
@ -2203,12 +2203,6 @@ void World::ScriptsProcess()
|
|||
break;
|
||||
}
|
||||
|
||||
if(!source->isType(TYPEMASK_UNIT))
|
||||
{
|
||||
sLog.outError("SCRIPT_COMMAND_CAST_SPELL source caster isn't unit (TypeId: %u), skipping.",source->GetTypeId());
|
||||
break;
|
||||
}
|
||||
|
||||
Object* cmdTarget = step.script->datalong2 & 0x01 ? source : target;
|
||||
|
||||
if(!cmdTarget)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue