root/trunk/AE-go_GameServer/src/com/aionemu/gameserver/controllers/CreatureController.java
Download diff| 990 | 1006 | ||
|---|---|---|---|
111 | } | 111 | } |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * Teleport Creature to the location using current heading | 114 | * Teleport Creature to the location using current heading and instanceId |
115 | * | 115 | * |
116 | * @param worldId | 116 | * @param worldId |
117 | * @param x | 117 | * @param x |
... | ... | ||
122 | */ | 122 | */ |
123 | public boolean teleportTo(int worldId, float x, float y, float z, int delay) | 123 | public boolean teleportTo(int worldId, float x, float y, float z, int delay) |
124 | { | 124 | { |
125 | return teleportTo(worldId, x, y, z, getOwner().getHeading(), delay); | 125 | int instanceId = 1; |
126 | if(getOwner().getWorldId() == worldId) | ||
127 | { | ||
128 | instanceId = getOwner().getInstanceId(); | ||
129 | } | ||
130 | return teleportTo(worldId, instanceId, x, y, z, delay); | ||
126 | } | 131 | } |
127 | 132 | ||
128 | /** | 133 | /** |
134 | * | ||
135 | * @param worldId | ||
136 | * @param instanceId | ||
137 | * @param x | ||
138 | * @param y | ||
139 | * @param z | ||
140 | * @param delay | ||
141 | * @return | ||
142 | */ | ||
143 | public boolean teleportTo(int worldId, int instanceId, float x, float y, float z, int delay) | ||
144 | { | ||
145 | return teleportTo(worldId, instanceId, x, y, z, getOwner().getHeading(), delay); | ||
146 | } | ||
147 | |||
148 | /** | ||
129 | * Teleport Creature to the location using specific heading | 149 | * Teleport Creature to the location using specific heading |
130 | * | 150 | * |
131 | * @param worldId | 151 | * @param worldId |
152 | * @param instanceId | ||
132 | * @param x | 153 | * @param x |
133 | * @param y | 154 | * @param y |
134 | * @param z | 155 | * @param z |
... | ... | ||
136 | * @param delay | 157 | * @param delay |
137 | * @return | 158 | * @return |
138 | */ | 159 | */ |
139 | public boolean teleportTo(int worldId, float x, float y, float z, byte heading, int delay) | 160 | public boolean teleportTo(int worldId, int instanceId, float x, float y, float z, byte heading, int delay) |
140 | { | 161 | { |
141 | return true; | 162 | return true; |
142 | } | 163 | } |