diff options
| author | Subv <s.v.h21@hotmail.com> | 2012-08-12 13:18:19 -0500 |
|---|---|---|
| committer | Subv <s.v.h21@hotmail.com> | 2012-08-12 13:18:19 -0500 |
| commit | 61fcae113b92053388433c2a98e0ec7f3c360acd (patch) | |
| tree | 10f3da98a5f8dd7056fc28a4edb6bd1cda0c30e8 /src/server/game/Entities/GameObject | |
| parent | 75af5ac3535e8726a03f9575357f44f3981989a0 (diff) | |
| parent | f92946e128ed44de21c97900b0a935c7c55fcd65 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Kalimdor/moonglade.cpp
Diffstat (limited to 'src/server/game/Entities/GameObject')
| -rwxr-xr-x | src/server/game/Entities/GameObject/GameObject.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 16151d0c79d..2e9780fb87e 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -138,9 +138,8 @@ void GameObject::AddToWorld() bool toggledState = GetGOData() ? GetGOData()->go_state == GO_STATE_READY : false; if (m_model) GetMap()->Insert(*m_model); - if (startOpen ^ toggledState) - EnableCollision(false); + EnableCollision(startOpen ^ toggledState); WorldObject::AddToWorld(); } } @@ -1925,7 +1924,7 @@ void GameObject::SetLootState(LootState state, Unit* unit) bool startOpen = (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? GetGOInfo()->door.startOpen : false); // Use the current go state - if (GetGoState() == GO_STATE_ACTIVE) + if (GetGoState() != GO_STATE_ACTIVE) startOpen = !startOpen; if (state == GO_ACTIVATED || state == GO_JUST_DEACTIVATED) |