mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 07:48:53 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
From 6b2c1c2661fac08070630fcab4bb7bd75cbc4814 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/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
index 53cfc10017..904c6e1a7d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
|
|
@@ -205,14 +205,14 @@ public class EntityExperienceOrb extends Entity {
|
|
public void b(NBTTagCompound nbttagcompound) {
|
|
nbttagcompound.setShort("Health", (short) this.d);
|
|
nbttagcompound.setShort("Age", (short) this.b);
|
|
- nbttagcompound.setShort("Value", (short) this.value);
|
|
+ nbttagcompound.setInt("Value", this.value); // Paper - save as Integer
|
|
savePaperNBT(nbttagcompound); // Paper
|
|
}
|
|
|
|
public void a(NBTTagCompound nbttagcompound) {
|
|
this.d = nbttagcompound.getShort("Health");
|
|
this.b = nbttagcompound.getShort("Age");
|
|
- this.value = nbttagcompound.getShort("Value");
|
|
+ this.value = nbttagcompound.getInt("Value"); // Paper - load as Integer
|
|
loadPaperNBT(nbttagcompound); // Paper
|
|
}
|
|
|
|
--
|
|
2.19.0
|
|
|