aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Creature
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-03-13 11:34:58 +0100
committerShauren <shauren.trinity@gmail.com>2013-03-13 11:34:58 +0100
commit2c169bcca51ca1b5cdbc73c9a4d402d46cdcfc15 (patch)
tree4101d9f6b3de8926ad9d929d6fdfbf26ecd67792 /src/server/game/Entities/Creature
parenta0f4937fbcc6b4723c018e21505b87cddbcabca4 (diff)
Core/Vehicles
* Fixed crash happening when passenger died on vehicle he was controlling * Fixed crash happening if vehicle control aura was removed before passenger is fully added to vehicle Closes #7160
Diffstat (limited to 'src/server/game/Entities/Creature')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 6f88222bbbc..83cdb52776c 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1294,8 +1294,8 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, uint3
if (!UpdateEntry(Entry, team, data))
return false;
- if (vehId && !CreateVehicleKit(vehId, Entry))
- vehId = 0;
+ if (vehId)
+ CreateVehicleKit(vehId, Entry);
return true;
}