Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
9a7ca3db Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-26 11:07:53 -05:00
parent d4e8659c65
commit 8e455eb2cf
11 changed files with 54 additions and 53 deletions

View File

@@ -1,4 +1,4 @@
From 10588016b28dcf38698b7e90134e60f1aa76685e Mon Sep 17 00:00:00 2001
From 413346301d87c28a9fdc6a12ad8be444a9b77226 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Fri, 7 Feb 2020 04:42:57 -0600
Subject: [PATCH] Ender dragon always drop egg
@@ -9,15 +9,15 @@ Subject: [PATCH] Ender dragon always drop egg
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
index 218c04245b..48398aa9f0 100644
index 687efa022d..ead3346072 100644
--- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
+++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
@@ -21,7 +21,7 @@ public class EnderDragonBattle {
private static final Logger LOGGER = LogManager.getLogger();
private static final Predicate<Entity> b = IEntitySelector.a.and(IEntitySelector.a(0.0D, 128.0D, 0.0D, 192.0D));
public final BossBattleServer bossBattle;
- private final WorldServer d;
+ private final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER
- public final WorldServer d; // CraftBukkit PAIL private -> public, rename world
+ public final WorldServer d; public WorldServer getWorld() { return d; } // Purpur - OBFHELPER
private final List<Integer> e;
private final ShapeDetector f;
private int g;