mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-04 22:14:40 +01:00
45 lines
2.5 KiB
Diff
45 lines
2.5 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
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
|
||
|
|
index 3e4bd1d6718d3ad2498fe9bd72eaac45044ecb77..4813f62d1e382d5ac6971b2244df3f13c80d1950 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -374,4 +374,9 @@ public class PaperWorldConfig {
|
||
|
|
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/world/level/dimension/end/EnderDragonBattle.java b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
|
||
|
|
index f727cc456bd23816c4e70be83c395d1d8ca7d876..0869af4670f040344f5b6c2c10bff5e5226f707c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/level/dimension/end/EnderDragonBattle.java
|
||
|
|
@@ -73,7 +73,7 @@ public class EnderDragonBattle {
|
||
|
|
private boolean dragonKilled;
|
||
|
|
private boolean previouslyKilled;
|
||
|
|
public UUID dragonUUID;
|
||
|
|
- private boolean n;
|
||
|
|
+ private boolean n; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
|
||
|
|
public BlockPosition exitPortalLocation;
|
||
|
|
public EnumDragonRespawn respawnPhase;
|
||
|
|
private int q;
|
||
|
|
@@ -83,6 +83,10 @@ public class EnderDragonBattle {
|
||
|
|
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();
|
||
|
|
this.n = true;
|
||
|
|
+ // Paper start
|
||
|
|
+ setScanForLegacyFight(worldserver.paperConfig.scanForLegacyEnderDragon);
|
||
|
|
+ if (!scanForLegacyFight()) dragonKilled = true;
|
||
|
|
+ // Paper end
|
||
|
|
this.world = worldserver;
|
||
|
|
if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
|
||
|
|
if (nbttagcompound.b("Dragon")) {
|