diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-08-26 19:21:22 +0200 |
| commit | 741f3dde2e880baf3439fe60f7166cea14b70196 (patch) | |
| tree | c7f49c46c258d1a587dee4b4367f5436a833c93e /src/server/scripts/World | |
| parent | 67fc6a9b42879bc6ea9010293780d4f82d9cb09e (diff) | |
| parent | febb26d4b711762b1ee605705e7fa949b9871df1 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
dep/PackageList.txt
src/server/game/Spells/Auras/SpellAuras.cpp
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/item_scripts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/scripts/World/item_scripts.cpp b/src/server/scripts/World/item_scripts.cpp index c53fe254db3..45886fd4361 100644 --- a/src/server/scripts/World/item_scripts.cpp +++ b/src/server/scripts/World/item_scripts.cpp @@ -241,7 +241,7 @@ public: float x, y, z; go->GetClosePoint(x, y, z, go->GetObjectSize() / 3, 7.0f); - go->SummonGameObject(GO_HIGH_QUALITY_FUR, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 0, 0, 0, 0, 1000); + go->SummonGameObject(GO_HIGH_QUALITY_FUR, go->GetPositionX(), go->GetPositionY(), go->GetPositionZ(), 0, 0, 0, 0, 0, 1); if (TempSummon* summon = player->SummonCreature(NPC_NESINGWARY_TRAPPER, x, y, z, go->GetOrientation(), TEMPSUMMON_DEAD_DESPAWN, 1000)) { summon->SetVisible(false); |