mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-18 12:48:53 +01:00
da9d110d5b
This patch does not appear to be doing anything useful, and may hide errors. Currently, the save logic does not run through this path either so it did not do anything. Additionally, properly implement support for handling RegionFileSizeException in Moonrise.
44 lines
2.3 KiB
Diff
44 lines
2.3 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] Fix NBT type issues
|
|
|
|
Addresses two issues:
|
|
- MC-135506: Experience should save as Integers
|
|
- Allay duplication cooldown is saved and exposed as a long, but loaded as an int
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
index 74a0bebbf829fdb2bbae87100c4e2523c34f95a0..9d9e3daebc5da0af627c3d3cdb50029aacbc587b 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/ExperienceOrb.java
|
|
@@ -309,7 +309,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
|
|
}
|
|
@@ -318,7 +318,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
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
|
index c0c054b604cdf87591e4ce7c9f15baa5c942aadc..05c3d43fafc781e2c2d762dd5f509753df8da3b3 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/allay/Allay.java
|
|
@@ -495,7 +495,7 @@ public class Allay extends PathfinderMob implements InventoryCarrier, VibrationS
|
|
});
|
|
}
|
|
|
|
- this.duplicationCooldown = (long) nbt.getInt("DuplicationCooldown");
|
|
+ this.duplicationCooldown = nbt.getLong("DuplicationCooldown"); // Paper - Load as long
|
|
this.entityData.set(Allay.DATA_CAN_DUPLICATE, nbt.getBoolean("CanDuplicate"));
|
|
}
|
|
|