2019-05-27 11:13:41 +02:00
From 0365c9c7e44ea4326f46d4cf77d2fe11f9586010 Mon Sep 17 00:00:00 2001
2018-06-22 17:49:10 +02:00
From: BillyGalbreath <Blake.Galbreath@GMail.com>
Date: Fri, 22 Jun 2018 10:38:31 -0500
Subject: [PATCH] Add config to disable ender dragon legacy check
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2019-05-14 04:20:58 +02:00
index ce17447fa..3294fbbea 100644
2018-06-22 17:49:10 +02:00
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
2019-04-30 03:20:24 +02:00
@@ -370,4 +370,9 @@ public class PaperWorldConfig {
2018-06-22 17:49:10 +02:00
private void shieldBlockingDelay() {
shieldBlockingDelay = getInt("game-mechanics.shield-blocking-delay", 5);
}
+
+ public boolean scanForLegacyEnderDragon = true;
+ private void scanForLegacyEnderDragon() {
+ scanForLegacyEnderDragon = getBoolean("game-mechanics.scan-for-legacy-ender-dragon", true);
+ }
}
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
2019-05-14 04:20:58 +02:00
index 6f92820c3..c9d271145 100644
2018-06-22 17:49:10 +02:00
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
2019-01-01 04:15:55 +01:00
@@ -28,10 +28,10 @@ public class EnderDragonBattle {
2018-06-22 17:49:10 +02:00
private int h;
private int i;
private int j;
2019-01-01 04:15:55 +01:00
- private boolean k;
+ private boolean k; private void setDragonKilled(boolean dragonKilled) { this.k = dragonKilled; } // Paper - OBFHELPER
2018-06-22 17:49:10 +02:00
private boolean l;
private UUID m;
2019-01-01 04:15:55 +01:00
- private boolean n;
+ private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
2018-06-22 17:49:10 +02:00
private BlockPosition o;
private EnumDragonRespawn p;
2018-09-01 00:56:57 +02:00
private int q;
2019-01-01 04:15:55 +01:00
@@ -41,6 +41,10 @@ public class EnderDragonBattle {
this.bossBattle = (BossBattleServer) (new BossBattleServer(new ChatMessage("entity.minecraft.ender_dragon", new Object[0]), BossBattle.BarColor.PINK, BossBattle.BarStyle.PROGRESS)).setPlayMusic(true).c(true);
this.e = Lists.newArrayList();
this.n = true;
2018-12-15 02:17:27 +01:00
+ // Paper start
+ setScanForLegacyFight(worldserver.paperConfig.scanForLegacyEnderDragon);
+ if (!scanForLegacyFight()) setDragonKilled(true);
+ // Paper end
this.d = worldserver;
if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
if (nbttagcompound.b("DragonUUID")) {
2018-06-22 17:49:10 +02:00
--
2019-03-20 02:46:00 +01:00
2.21.0
2018-06-22 17:49:10 +02:00