[Fixed] Restructured checks for village active area entry so that admins
can enter village, even if they haven't completed/have the quest.

Change-Id: I0130a856359b37351b161210a212d4134592a352
Merge "[Fixed] Restructured checks for village active area entry so that admins can enter village, even if they haven't completed/have the quest." into unstable