Index: code/object/collideshipship.cpp
===================================================================
--- code/object/collideshipship.cpp	(revision 9405)
+++ code/object/collideshipship.cpp	(working copy)
@@ -72,7 +72,9 @@
 		if (aip1->goal_objnum == OBJ_INDEX(objp2)){
 			return 1;
 		}
-	} else if (aip2->mode == AIM_DOCK) {
+	}
+
+	if (aip2->mode == AIM_DOCK) {
 		if (aip2->goal_objnum == OBJ_INDEX(objp1)){
 			return 1;
 		}