Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/scripts/Commands/cs_npc.cpp src/server/scripts/Commands/cs_wp.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
This commit is contained in:
commit
65ae868cc8
59 files changed
+574
-514
No files matched your search
@@ -227,14 +227,6 @@ public:
|
||||
if (!charID)
|
||||
return false;
|
||||
|
||||
char* team = strtok(NULL, " ");
|
||||
int32 teamval = 0;
|
||||
if (team)
|
||||
teamval = atoi(team);
|
||||
|
||||
if (teamval < 0)
|
||||
teamval = 0;
|
||||
|
||||
uint32 id = atoi(charID);
|
||||
if (!sObjectMgr->GetCreatureTemplate(id))
|
||||
return false;
|
||||
@@ -266,7 +258,7 @@ public:
|
||||
}
|
||||
|
||||
Creature* creature = new Creature();
|
||||
if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, 0, (uint32)teamval, x, y, z, o))
|
||||
if (!creature->Create(sObjectMgr->GenerateLowGuid(HIGHGUID_UNIT), map, chr->GetPhaseMgr().GetPhaseMaskForSpawn(), id, x, y, z, o))
|
||||
{
|
||||
delete creature;
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user