mirror of https://github.com/PaperMC/Paper.git
37 lines
1.9 KiB
Diff
37 lines
1.9 KiB
Diff
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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 02bb85364560784adea47c877c13291c3d016b86..424754a0183b071d20c86f0420cec784a8992e2b 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -683,4 +683,12 @@ public class PaperWorldConfig {
|
|
log("Using vanilla redstone algorithm.");
|
|
}
|
|
}
|
|
+
|
|
+ public boolean shouldRemoveDragon = false;
|
|
+ private void shouldRemoveDragon() {
|
|
+ shouldRemoveDragon = getBoolean("should-remove-dragon", shouldRemoveDragon);
|
|
+ if (shouldRemoveDragon) {
|
|
+ log("The Ender Dragon will be removed if she already exists without a portal.");
|
|
+ }
|
|
+ }
|
|
}
|
|
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 590df3b93b897613cad74f9920aec62b33a2f7f7..84447e9845edad2d228b94184b35b4afb453a14b 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
|
|
@@ -210,7 +210,7 @@ public class EndDragonFight {
|
|
this.dragonUUID = entityenderdragon.getUUID();
|
|
EndDragonFight.LOGGER.info("Found that there's a dragon still alive ({})", entityenderdragon);
|
|
this.dragonKilled = false;
|
|
- if (!flag) {
|
|
+ if (!flag && this.level.paperConfig.shouldRemoveDragon) { // Paper
|
|
EndDragonFight.LOGGER.info("But we didn't have a portal, let's remove it.");
|
|
entityenderdragon.remove();
|
|
this.dragonUUID = null;
|