Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/tools/map_extractor/dbcfile.h src/tools/vmap4_extractor/adtfile.cpp src/tools/vmap4_extractor/adtfile.h src/tools/vmap4_extractor/loadlib/loadlib.h
This commit is contained in:
commit
81c99b3338
34 files changed
+142
-25
No files matched your search
@@ -7210,6 +7210,9 @@ bool Unit::HandleOverrideClassScriptAuraProc(Unit* victim, uint32 /*damage*/, Au
|
||||
|
||||
void Unit::setPowerType(Powers new_powertype)
|
||||
{
|
||||
if (getPowerType() == new_powertype)
|
||||
return;
|
||||
|
||||
SetByteValue(UNIT_FIELD_BYTES_0, 3, new_powertype);
|
||||
|
||||
if (GetTypeId() == TYPEID_PLAYER)
|
||||
|
||||
Reference in new issue
Block a user