Scripts/Wintergrasp: Fix vehicle teleporter #17550
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
By WoWErrorDev closes TrinityCore#5831
| if (Creature* teleportTrigger = passenger->SummonTrigger(go->GetPositionX()-60.0f, go->GetPositionY(), go->GetPositionZ()+1.0f, cVeh->GetOrientation(), 1000)) | ||
| return teleportTrigger; | ||
|
|
||
| return NULL; |
…to wintergrasp_vehicle_teleporter
Aokromes
changed the title
Aokromes
force-pushed
the
wintergrasp_vehicle_teleporter
branch
from
66b8ebc
to
a956047
Compare
… bad, choice where you work, and continue there.
…to wintergrasp_vehicle_teleporter
| (go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_ALLIANCE] && passenger->getRaceMask() & RACEMASK_ALLIANCE)); | ||
| } | ||
|
|
||
|
|
…to wintergrasp_vehicle_teleporter
| { | ||
| if (_checkTimer <= diff) | ||
| return ((go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_HORDE] && passenger->getRaceMask() & RACEMASK_HORDE) || |
There was a problem hiding this comment.
is RaceMask the correct way to get the faction ?
There was a problem hiding this comment.
After searching in the source, I would guess no. Perhaps better to use
return ((go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_HORDE] && passenger->getFaction() & HORDE) ||
(go->GetUInt32Value(GAMEOBJECT_FACTION) == WintergraspFaction[TEAM_ALLIANCE] && passenger->getFaction() & ALLIANCE));but maybe it depends on if the check needs to return a specific value or just a comparison difference (high/low).
https://github.com/TrinityCore/TrinityCore/blob/3.3.5/src/server/game/Miscellaneous/SharedDefines.h#L93-L103
vs
https://github.com/TrinityCore/TrinityCore/blob/3.3.5/src/server/game/Miscellaneous/SharedDefines.h#L651-L661
Aokromes
added a commit
to Aokromes/TrinityCore
that referenced
this pull request
Oct 5, 2016
By WoWErrorDev, closes TrinityCore#5831.
joschiwald
pushed a commit
that referenced
this pull request
Mar 5, 2017
conan513
pushed a commit
to conan513/SingleCore_TC
that referenced
this pull request
Mar 13, 2017
By WoWErrorDev, closes TrinityCore#5831. (cherry picked from commit 308a241)
conan513
pushed a commit
to conan513/SingleCore_TC
that referenced
this pull request
Apr 16, 2017
By WoWErrorDev, closes TrinityCore#5831.
Krudor
pushed a commit
to Krudor/TrinityCore
that referenced
this pull request
Jul 13, 2017
By WoWErrorDev, closes TrinityCore#5831. (cherry picked from commit 308a241)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes proposed:
Fix wintergrasp vehicle teleporters
Target branch(es): 335/6x
Issues addressed: Closes #5831
Tests performed: (Does it build, tested in-game, etc)
By WoWErrorDev