Update to latest upstream
See MassiveCraft/mcore@e54b70893624f30fed3a53f48a52fc75ac402460 and MassiveCraft/mcore@dd4fd924f15aedf6616652c18403c551ee68db68 for more info