2020-05-06 09:48:49 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-06-22 15:49:10 +00: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
|
2020-06-28 08:35:41 +00:00
|
|
|
index 35075ffac394153e28039809e0ed48fe066a6223..6352051ab937d4d365e823a7112e76dc3ec34225 100644
|
2018-06-22 15:49:10 +00:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2020-06-28 08:35:41 +00:00
|
|
|
@@ -367,4 +367,9 @@ public class PaperWorldConfig {
|
2018-06-22 15:49:10 +00: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
|
2020-06-27 05:12:11 +00:00
|
|
|
index 356defd19ebba5b051b7dbdcc21f0139bbdc4a84..69faefbdbf338b38311cd2a5d3183a104ec36f86 100644
|
2018-06-22 15:49:10 +00:00
|
|
|
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -28,10 +28,10 @@ public class EnderDragonBattle {
|
2018-06-22 15:49:10 +00:00
|
|
|
private int h;
|
|
|
|
private int i;
|
|
|
|
private int j;
|
2020-06-25 14:09:55 +00:00
|
|
|
- private boolean dragonKilled;
|
|
|
|
+ private boolean dragonKilled; private void setDragonKilled(boolean dragonKilled) { this.dragonKilled = dragonKilled; } // Paper - OBFHELPER
|
|
|
|
private boolean previouslyKilled;
|
|
|
|
public UUID dragonUUID;
|
2019-01-01 03:15:55 +00:00
|
|
|
- private boolean n;
|
2020-03-26 02:37:20 +00:00
|
|
|
+ private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
|
2020-06-25 14:09:55 +00:00
|
|
|
public BlockPosition exitPortalLocation;
|
|
|
|
public EnumDragonRespawn respawnPhase;
|
2018-08-31 22:56:57 +00:00
|
|
|
private int q;
|
2019-01-01 03:15:55 +00:00
|
|
|
@@ -41,6 +41,10 @@ public class EnderDragonBattle {
|
2020-06-25 14:09:55 +00:00
|
|
|
this.bossBattle = (BossBattleServer) (new BossBattleServer(new ChatMessage("entity.minecraft.ender_dragon"), BossBattle.BarColor.PINK, BossBattle.BarStyle.PROGRESS)).setPlayMusic(true).c(true);
|
|
|
|
this.gateways = Lists.newArrayList();
|
2019-01-01 03:15:55 +00:00
|
|
|
this.n = true;
|
2018-12-15 01:17:27 +00:00
|
|
|
+ // Paper start
|
|
|
|
+ setScanForLegacyFight(worldserver.paperConfig.scanForLegacyEnderDragon);
|
|
|
|
+ if (!scanForLegacyFight()) setDragonKilled(true);
|
|
|
|
+ // Paper end
|
2020-06-25 14:09:55 +00:00
|
|
|
this.world = worldserver;
|
2018-12-15 01:17:27 +00:00
|
|
|
if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
|
2020-06-25 14:09:55 +00:00
|
|
|
if (nbttagcompound.b("Dragon")) {
|