Merge branch 'master' into pre/1.13

* master:
  Fix "MC-135506: Experience should save as Integers" still saving as short" (#1301)

Spigot-Server-Patches/0329-MC-135506-Experience-should-save-as-Integers.patch

@@ -13,7 +13,7 @@ index b8bfc75771..1cffc6f9a9 100644
          nbttagcompound.setShort("Health", (short) this.d);
          nbttagcompound.setShort("Age", (short) this.b);
 -        nbttagcompound.setShort("Value", (short) this.value);
-+        nbttagcompound.setInt("Value", (short) this.value); // Paper - save as Integer
++        nbttagcompound.setInt("Value", this.value); // Paper - save as Integer
          savePaperNBT(nbttagcompound); // Paper
      }