2022-06-09 10:51:45 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Mariell Hoversholm <proximyst@proximyst.com>
|
|
|
|
Date: Wed, 30 Sep 2020 22:49:14 +0200
|
|
|
|
Subject: [PATCH] Toggle for removing existing dragon
|
|
|
|
|
|
|
|
|
|
|
|
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
|
2024-04-24 15:46:45 +02:00
|
|
|
index 79b63082e849f29244352b9d0d6ac9b7df7813f6..3ea0ca395e0561d96044f0f84442a08b42b539bd 100644
|
2022-06-09 10:51:45 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
|
2023-08-06 02:21:59 +02:00
|
|
|
@@ -209,7 +209,7 @@ public class EndDragonFight {
|
|
|
|
this.dragonUUID = entityenderdragon.getUUID();
|
|
|
|
EndDragonFight.LOGGER.info("Found that there's a dragon still alive ({})", entityenderdragon);
|
2022-06-09 10:51:45 +02:00
|
|
|
this.dragonKilled = false;
|
2023-08-06 02:21:59 +02:00
|
|
|
- if (!flag) {
|
2024-01-20 12:50:16 +01:00
|
|
|
+ if (!flag && this.level.paperConfig().entities.behavior.shouldRemoveDragon) { // Paper - Toggle for removing existing dragon
|
2023-08-06 02:21:59 +02:00
|
|
|
EndDragonFight.LOGGER.info("But we didn't have a portal, let's remove it.");
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
entityenderdragon.discard(null); // CraftBukkit - add Bukkit remove cause
|
2022-06-09 10:51:45 +02:00
|
|
|
this.dragonUUID = null;
|