Update to latest upstream
See MassiveCraft/mcore@bd98a9f87a57af1c356221918185f63fcaa8aede and MassiveCraft/mcore@579919f75f7f99894978f1b82b1ef775782d0639 for more info