mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-26 21:52:51 +02:00
ce270e1412
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 Bukkit Changes: b2f1908c SPIGOT-5783: Add helpful info to UnknownDependencyException e4f46260 SPIGOT-2623: Add EntityEquipment methods to get/set ItemStacks by slot. 529a9a69 SPIGOT-5751: Clarify behaviour of block drop-related API methods CraftBukkit Changes:8ea9b138Remove outdated build delay.ffc2b251Revert "#675: Fix redirected CommandNodes sometimes not being properly redirected"cb701f6b#675: Fix redirected CommandNodes sometimes not being properly redirectedc9d7c16bSPIGOT-2623: Add EntityEquipment methods to get/set ItemStacks by slot.fad2494a#673: Fix Craftworld#isChunkLoaded8637ec00SPIGOT-5751: Made breakNaturally and getDrops returns the correct item if no argument is given Spigot Changes: a99063f7 Rebuild patches Fixes #3602
38 lines
1.8 KiB
Diff
38 lines
1.8 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 aecdaacfc7da560759bc513680d76f55820d5046..7daebfdab5c6e258d3e426643c0dbd374774ff5d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
|
|
@@ -33,7 +33,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
public float bx;
|
|
public float by;
|
|
public boolean bz;
|
|
- public int bA;
|
|
+ public int bA; public final int getDeathTicks() { return this.bA; } public final void setDeathTicks(final int value) { this.bA = value; } // Paper
|
|
public float bB;
|
|
@Nullable
|
|
public EntityEnderCrystal currentEnderCrystal;
|
|
@@ -833,6 +833,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
public void b(NBTTagCompound nbttagcompound) {
|
|
super.b(nbttagcompound);
|
|
nbttagcompound.setInt("DragonPhase", this.bO.a().getControllerPhase().b());
|
|
+ nbttagcompound.setInt("Paper.DeathTick", this.getDeathTicks()); // Paper
|
|
}
|
|
|
|
@Override
|
|
@@ -841,6 +842,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
|
|
if (nbttagcompound.hasKey("DragonPhase")) {
|
|
this.bO.setControllerPhase(DragonControllerPhase.getById(nbttagcompound.getInt("DragonPhase")));
|
|
}
|
|
+ this.setDeathTicks(nbttagcompound.getInt("Paper.DeathTick")); // Paper
|
|
|
|
}
|
|
|