Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Spells/SpellInfo.h src/server/game/World/World.cpp
This commit is contained in:
commit
f7aedaef33
56 files changed
+455
-117
No files matched your search
@@ -1037,6 +1037,10 @@ struct SmartTarget
|
||||
raw.param1 = p1;
|
||||
raw.param2 = p2;
|
||||
raw.param3 = p3;
|
||||
x = 0.0f;
|
||||
y = 0.0f;
|
||||
z = 0.0f;
|
||||
o = 0.0f;
|
||||
}
|
||||
SMARTAI_TARGETS type;
|
||||
float x, y, z, o;
|
||||
|
||||
Reference in new issue
Block a user