Remove Moonrise utils to MCUtils, remove duplicated/unused utils

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0429-Toggle-for-removing-existing-dragon.patch b/patches/server/0429-Toggle-for-removing-existing-dragon.patch
new file mode 100644
index 0000000000..1bfa511969
--- /dev/null
+++ b/patches/server/0429-Toggle-for-removing-existing-dragon.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mariell Hoversholm <[email protected]>
+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
+index 79b63082e849f29244352b9d0d6ac9b7df7813f6..3ea0ca395e0561d96044f0f84442a08b42b539bd 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
+@@ -209,7 +209,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().entities.behavior.shouldRemoveDragon) { // Paper - Toggle for removing existing dragon
+                 EndDragonFight.LOGGER.info("But we didn't have a portal, let's remove it.");
+                 entityenderdragon.discard(null); // CraftBukkit - add Bukkit remove cause
+                 this.dragonUUID = null;