mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-02 00:18:02 +02:00
928bcc8d3a
Upstream has released updates that appear 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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
25 lines
1.1 KiB
Diff
25 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
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 908cc3e2fc2cf4894a10081192a8b0d3c7e99932..f32906729baf83d8b53d64ab750cddcc413a2927 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
|
|
@@ -409,6 +409,7 @@ public class EndDragonFight {
|
|
enderDragon.moveTo(0.0D, 128.0D, 0.0D, this.level.random.nextFloat() * 360.0F, 0.0F);
|
|
this.level.addFreshEntity(enderDragon);
|
|
this.dragonUUID = enderDragon.getUUID();
|
|
+ this.resetSpikeCrystals(); // Paper
|
|
return enderDragon;
|
|
}
|
|
|