2018-12-13 08:40:29 +08:00
|
|
|
From ca75b9e2215df7923fe306514a5e3514f694d94f Mon Sep 17 00:00:00 2001
|
2018-06-22 23:49:10 +08: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
|
2018-12-13 08:40:29 +08:00
|
|
|
index 875650b8d..74185b31f 100644
|
2018-06-22 23:49:10 +08:00
|
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
2018-12-13 08:40:29 +08:00
|
|
|
@@ -438,4 +438,9 @@ public class PaperWorldConfig {
|
2018-06-22 23:49:10 +08: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
|
2018-12-08 18:09:55 +08:00
|
|
|
index 1e22aa531..67808446c 100644
|
2018-06-22 23:49:10 +08:00
|
|
|
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
|
2018-12-08 18:09:55 +08:00
|
|
|
@@ -27,10 +27,11 @@ public class EnderDragonBattle {
|
2018-06-22 23:49:10 +08:00
|
|
|
private int h;
|
|
|
|
private int i;
|
|
|
|
private int j;
|
|
|
|
+ private void setDragonKilled(boolean dragonKilled) { this.k = dragonKilled; } // Paper - OBFHELPER
|
|
|
|
private boolean k;
|
|
|
|
private boolean l;
|
|
|
|
private UUID m;
|
2018-12-08 18:09:55 +08:00
|
|
|
- private boolean n = true;
|
|
|
|
+ private boolean n = true; private void setScanForLegacyFight(boolean scanForLegacyFight) { this.n = scanForLegacyFight; } private boolean scanForLegacyFight() { return this.n; } // Paper - OBFHELPER
|
2018-06-22 23:49:10 +08:00
|
|
|
private BlockPosition o;
|
|
|
|
private EnumDragonRespawn p;
|
2018-09-01 06:56:57 +08:00
|
|
|
private int q;
|
2018-12-08 18:09:55 +08:00
|
|
|
@@ -293,7 +294,7 @@ public class EnderDragonBattle {
|
|
|
|
hashset.add(entityplayer);
|
|
|
|
}
|
2018-09-01 06:56:57 +08:00
|
|
|
|
2018-12-08 18:09:55 +08:00
|
|
|
- HashSet hashset1 = Sets.newHashSet(this.bossBattle.getPlayers());
|
|
|
|
+ HashSet<EntityPlayer> hashset1 = Sets.newHashSet(this.bossBattle.getPlayers()); // Paper - decomp fix
|
|
|
|
hashset1.removeAll(hashset);
|
|
|
|
|
|
|
|
for(EntityPlayer entityplayer1 : hashset1) {
|
2018-06-22 23:49:10 +08:00
|
|
|
--
|
2018-12-13 08:40:29 +08:00
|
|
|
2.20.0
|
2018-06-22 23:49:10 +08:00
|
|
|
|