Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
8782be3b [CI-SKIP] Rebuild patches
ff8a48b9 Don't show 1.15 plugins as legacy in plugins command (#2755)
a1339802 port PlayerLaunchProjectileEvent patch to 1.15 (#2758)
f3c55f23 port TE chunk lookup patch to 1.15 (#2757)
This commit is contained in:
William Blake Galbreath
2019-12-15 12:55:25 -06:00
parent 5a9b601490
commit 16f0f182b8
4 changed files with 8 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
From 22b94a39b6069106fd8525f79d1c009e85bfef80 Mon Sep 17 00:00:00 2001
From 9af56364f87ffd81d371289b05eb125849562eb0 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,7 +233,7 @@ index f3da3a82d9..8f4ca4c285 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 21bfdf9e71..65929255d5 100644
index ab5c6e92ea..1580640ae3 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -296,7 +296,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -243,8 +243,8 @@ index 21bfdf9e71..65929255d5 100644
- return new com.destroystokyo.paper.PaperVersionFetcher();
+ return new net.pl3x.purpur.PurpurVersionFetcher();
}
// Paper end
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
index 674096cab1..e9aee2d8a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java