Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
7329e19c Updated Upstream (CraftBukkit)
b3a97d14 Fix startup errors when double clicking jar (#2903)
b51fbefc Revert "Fix errors on startup when double clicking jar (#2901)"
a0438fab Fix errors on startup when double clicking jar (#2901)
e0da6d4b Seed based feature search (Fixes #2312) (#2852)
78dfb77e Updated Upstream (Bukkit/CraftBukkit)
969ef51a Init legacy material data
c4714909 Fix items vanishing through end portal (Resolves #2681) (#2894)
74b0ef39 Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-01-25 02:35:47 -06:00
parent 0118e083d1
commit 8f99ddb050
8 changed files with 24 additions and 24 deletions

View File

@@ -1,4 +1,4 @@
From 56a276c134cd6770a63b90cf1f8b049fedf6f7de Mon Sep 17 00:00:00 2001
From 0f5433bc7ea1fc537ab605d06e3ddad2cf44984e Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 4 May 2019 01:02:11 -0500
Subject: [PATCH] Rebrand
@@ -233,10 +233,10 @@ index ee5c57ca2..55b849237 100644
private final String bukkitVersion = Versioning.getBukkitVersion();
private final Logger logger = Logger.getLogger("Minecraft");
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 6a6e4fe48..bd384024f 100644
index 8d93ad6b4..e9942016b 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -298,7 +298,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -299,7 +299,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {