1 files changed, 24 insertions, 0 deletions
diff --git a/patches/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch b/patches/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch
new file mode 100644
index 0000000000..f727c2200f
--- /dev/null
+++ b/patches/server/0425-Reset-Ender-Crystals-on-Dragon-Spawn.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Aikar <[email protected]>
+Date: Wed, 1 Jun 2016 23:29:17 -0400
+Subject: [PATCH] Reset Ender Crystals on Dragon Spawn
+
+Crystals can end up in a bad state in certain conditions which causes
+an exception on the expected number of crystals going negative.
+
+This ensures the crystals/pillars are in expected state when the dragon spawns.
+
+See #3522
+
+diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
+index 6f9c78b124a33212125e98905efc8a09a1891500..79b63082e849f29244352b9d0d6ac9b7df7813f6 100644
+--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
++++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
+@@ -472,6 +472,7 @@ public class EndDragonFight {
+             entityenderdragon.moveTo((double) this.origin.getX(), (double) (128 + this.origin.getY()), (double) this.origin.getZ(), this.level.random.nextFloat() * 360.0F, 0.0F);
+             this.level.addFreshEntity(entityenderdragon);
+             this.dragonUUID = entityenderdragon.getUUID();
++            this.resetSpikeCrystals(); // Paper - Reset ender crystals on dragon spawn
+         }
+ 
+         return entityenderdragon;