aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Creature
diff options
context:
space:
mode:
authorMachiavelli <machiavelli.trinity@gmail.com>2013-02-18 00:39:58 +0100
committerMachiavelli <machiavelli.trinity@gmail.com>2013-02-18 00:39:58 +0100
commit01fbbf3b9352b6dcbedb39711fc2edd137e9f5b9 (patch)
tree0cf1599856b80b2bbdcb6d1acc85a2b0a56a681e /src/server/game/Entities/Creature
parentfab33f077436a958234f3f11f0cffc92a968660a (diff)
Core/Vehicles: Refactor some parts of vehicle system
- Fix a few crashes: Closes #9235 - Simplify and get rid of lots of redundant and silly code - Optimisations in Unit::ChangeSeat - More documentation
Diffstat (limited to 'src/server/game/Entities/Creature')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 6208bcc4727..0bcb2d76055 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1270,14 +1270,14 @@ bool Creature::CreateFromProto(uint32 guidlow, uint32 Entry, uint32 vehId, uint3
if (!vehId)
vehId = cinfo->VehicleId;
- if (vehId && !CreateVehicleKit(vehId, Entry))
- vehId = 0;
-
Object::_Create(guidlow, Entry, vehId ? HIGHGUID_VEHICLE : HIGHGUID_UNIT);
if (!UpdateEntry(Entry, team, data))
return false;
+ if (vehId && !CreateVehicleKit(vehId, Entry))
+ vehId = 0;
+
return true;
}