CORE: fixed a crash when using certain shields
Merge branch 'master' of https://github.com/DarkstarProject/darkstar