mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-11 09:23:42 +01:00
654b792caf
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes:a339310c#755: Fix NPE when calling getInventory() for virtual EnderChests2577f9bfIncrease outdated build delay1dabfdc8#754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures
28 lines
1.4 KiB
Diff
28 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
|
|
Date: Fri, 12 Jun 2020 22:25:11 -0700
|
|
Subject: [PATCH] Fix enderdragon exp dupe
|
|
|
|
Properly track death stage when unloading/loading in the
|
|
dragon
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
index 0e7c5dd9224d06fecf75c00c0c56d610a8fa8f4c..6b2c5e8d4640e19d33cbfe76d2399e6100890dbc 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
@@ -830,6 +830,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
public void saveData(NBTTagCompound nbttagcompound) {
|
|
super.saveData(nbttagcompound);
|
|
nbttagcompound.setInt("DragonPhase", this.bG.a().getControllerPhase().b());
|
|
+ nbttagcompound.setInt("Paper.DeathTick", this.deathAnimationTicks); // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -838,6 +839,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
if (nbttagcompound.hasKey("DragonPhase")) {
|
|
this.bG.setControllerPhase(DragonControllerPhase.getById(nbttagcompound.getInt("DragonPhase")));
|
|
}
|
|
+ this.deathAnimationTicks = nbttagcompound.getInt("Paper.DeathTick"); // Paper
|
|
|
|
}
|
|
|