Upstream - Prevent attribute and NBT client crashes, dont spawn bonus ocelots when spawned via plugin