Fix NPE, add 1.6.4 village code