Repaired Villager's event system