Make wingmen follow you through jumpgates.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index 75656dc..c017ce1 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -693,10 +693,13 @@ void Ship::frame(const unsigned long elapsed)
 					
 					set_zone(ship_jumpdepart->target()->zone());
 					
-					if (owner() && owner()->view() && (owner()->view()->zone() != ship_jumpdepart->target()->zone()))
-						owner()->set_view(0);
+					if (owner()) {
+						if (owner()->view() && (owner()->view()->zone() != ship_jumpdepart->target()->zone())) {
+							owner()->set_view(0);
+						}
 					
-					owner()->send("^BJumping to the " + ship_jumpdepart->target()->zone()->name());
+						owner()->send("^BJumping to the " + ship_jumpdepart->target()->zone()->name());
+					}
 				} else {
 					set_state(core::Entity::Normal);
 				}
@@ -1155,6 +1158,7 @@ void Ship::frame_autopilot_dock(const unsigned long elapsed, core::Entity *targe
 		// jumpgates have their own docking function
 		JumpGate *jumpgate = static_cast<JumpGate *>(target);
 		jumpgate->func_dock(this);
+		
 		unset_autopilot_flag(AutoPilotDock);
 		return;