Efficiency: Fixed broken windoors and stuff
Merge pull request #1935 from Duny-/Defficiency_tweaking

Efficiency: Fixed broken windoors and stuff