Merge pull request #3230 from Citadel-Station-13/upstream-merge-31414

[MIRROR] Fixes mob swap on tables.
2017-10-08 16:23:43 -04:00
parent 89e4088b86 d29801e4b9
commit 56f05a8476
1 changed files with 8 additions and 4 deletions
@@ -152,16 +152,20 @@
 			M.pass_flags |= PASSMOB
 			pass_flags |= PASSMOB

-			M.Move(oldloc)
-			Move(oldMloc)
-
+			var/move_failed = FALSE
+			if(!M.Move(oldloc) || !Move(oldMloc))
+				M.forceMove(oldMloc)
+				forceMove(oldloc)
+				move_failed = TRUE
 			if(!src_passmob)
 				pass_flags &= ~PASSMOB
 			if(!M_passmob)
 				M.pass_flags &= ~PASSMOB

 			now_pushing = 0
-			return 1
+			
+			if(!move_failed)
+				return 1

 	//okay, so we didn't switch. but should we push?
 	//not if he's not CANPUSH of course