mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 01:12:47 +01:00
bc127ea819
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: eec4aab0 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent 205213c6 SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron CraftBukkit Changes: b8c522d5 SPIGOT-6657: Add getPlayer to SheepDyeWoolEvent f04a77dc SPIGOT-6656: CauldronLevelChangeEvent is not fired correctly when dripstone fills the cauldron d1dbcebc SPIGOT-6653: Canceling snow bucket placement removes snow from bucket 4f34a67b #891: Fix scheduler task ID overflow and duplication issues Spigot Changes: d03d7f12 BUILDTOOLS-604: Rebuild patches
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Fri, 3 Aug 2018 00:04:54 -0400
|
|
Subject: [PATCH] MC-135506: Experience should save as Integers
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
index 707380c41df3a5783953ee0b6fe81b55fc7ed3cd..1caf10ecf949e0f465ffe573f3bed1a3c5733a7f 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
@@ -283,7 +283,7 @@ public class ExperienceOrb extends Entity {
|
|
public void addAdditionalSaveData(CompoundTag nbt) {
|
|
nbt.putShort("Health", (short) this.health);
|
|
nbt.putShort("Age", (short) this.age);
|
|
- nbt.putShort("Value", (short) this.value);
|
|
+ nbt.putInt("Value", this.value); // Paper - save as Integer
|
|
nbt.putInt("Count", this.count);
|
|
this.savePaperNBT(nbt); // Paper
|
|
}
|
|
@@ -292,7 +292,7 @@ public class ExperienceOrb extends Entity {
|
|
public void readAdditionalSaveData(CompoundTag nbt) {
|
|
this.health = nbt.getShort("Health");
|
|
this.age = nbt.getShort("Age");
|
|
- this.value = nbt.getShort("Value");
|
|
+ this.value = nbt.getInt("Value"); // Paper - load as Integer
|
|
this.count = Math.max(nbt.getInt("Count"), 1);
|
|
this.loadPaperNBT(nbt); // Paper
|
|
}
|