I think this fixes the last issue, but now seeing issues that occur with swapping on entity delete, I don't know if this is a new issue or not

[#59994516]
Merge pull request #786 from NREL/59994516_PluginDoors

I think this fixes the last issue, but now seeing issues that occur with. Thanks, I must have missed that.