Readded the patch for CraftBukkit with the serialization changes. Thanks to @thinkofdeath for the help