Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 18 Packages Projects Releases Wiki Activity

Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4

Browse Source 
Conflicts:
	.travis.yml
	cmake/macros/ConfigureBoost.cmake
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_21_00_world.sql
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/worldserver/Main.cpp
This commit is contained in:
Carbenium committed 2015-07-22 00:26:09 +02:00
2 parents d175c5fa59 4fd51ab3b9
commit fd0ef7bfab
402 files changed
+2494 -366
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/scripts/Commands/cs_misc.cpp
+2 -1
View File
@@ -236,7 +236,8 @@ public:
zoneId, (zoneEntry ? zoneEntry->area_name : unknown),
areaId, (areaEntry ? areaEntry->area_name : unknown),
object->GetPhaseMask(),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation(),
object->GetPositionX(), object->GetPositionY(), object->GetPositionZ(), object->GetOrientation());
handler->PSendSysMessage(LANG_GRID_POSITION,
cell.GridX(), cell.GridY(), cell.CellX(), cell.CellY(), object->GetInstanceId(),
zoneX, zoneY, groundZ, floorZ, haveMap, haveVMap, haveMMap);