Night's Watch succession bug fix... I think.

I've been having an issue with The Night's Watch occasionally passing to a non-black brother.

Vanilla version        More Bloodlines Version

I think I have a fix, but because I don't really know how to replicate the bug I can't be sure it works. What I've done is replicate part of the Night's Watch Government Check event ( nights_watch_events.txt / id = nightswatch.7 )
within a while loop in the Night's Watch election section of "AGOT on death/abdication event### #RULER ONLY ACTIONS" event ( on_action_events.txt / id = 45341 )

I've also added a decision to fix the problem if it somehow happens anyway. The decision will give The Night's Watch to a random un-landed black brother and then run some of The Night's Watch maintenance events. It then fires an event to the previous title-holder-in-error setting their government type to feudal and succession to primo-agn-cogn, then vassalizing them back to their de jure liege.

It's not perfect, but if any of the variables in the decision are not right for the current situation, they're easy enough to edit. 


Just wondering if anyone more experienced than I sees anything obviously wrong with this that I'm missing.

while = { ### Night's Watch Fix ###

    limit = {

        NOT = {

            primary_title = {

                current_heir = {

                    trait = nightswatch

                }

            }

        }

    }

    set_government_type = NW_government



    any_demesne_title = { succession = open_elective }



    any_demesne_title = {

        add_law = {

            law = succ_open_elective

            cooldown = no

            opinion_effect = no

        }

    }

    d_nightswatch = {

        add_law = {

            law = nightswatch_elective

            cooldown = no

            opinion_effect = no

        }

    }

recalc_succession = yes

}