From 6fea984629df1e99821f7594c5ad65d18d76af03 Mon Sep 17 00:00:00 2001 From: Mariell Hoversholm Date: Sun, 27 Sep 2020 16:52:40 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: a339310c #755: Fix NPE when calling getInventory() for virtual EnderChests 2577f9bf Increase outdated build delay 1dabfdc8 #754: Fix pre-1.16 serialized SkullMeta being broken on 1.16+, losing textures --- ...support.patch => 0551-Brand-support.patch} | 0 ...support.patch => 0561-Brand-support.patch} | 0 .../Add-setPlayerProfile-API-for-Skulls.patch | 4 +-- ...ting-location-from-InventoryEnderChe.patch | 28 ------------------- .../Fix-this-stupid-bullshit.patch | 2 +- Spigot-Server-Patches/POM-Changes.patch | 2 +- ...ient-crashes-server-lists-and-Mojang.patch | 2 +- work/CraftBukkit | 2 +- 8 files changed, 6 insertions(+), 34 deletions(-) rename Spigot-Server-Patches/{0552-Brand-support.patch => 0551-Brand-support.patch} (100%) rename Spigot-Server-Patches/{0562-Brand-support.patch => 0561-Brand-support.patch} (100%) delete mode 100644 Spigot-Server-Patches/Fix-NPE-when-getting-location-from-InventoryEnderChe.patch diff --git a/Spigot-Server-Patches/0552-Brand-support.patch b/Spigot-Server-Patches/0551-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0552-Brand-support.patch rename to Spigot-Server-Patches/0551-Brand-support.patch diff --git a/Spigot-Server-Patches/0562-Brand-support.patch b/Spigot-Server-Patches/0561-Brand-support.patch similarity index 100% rename from Spigot-Server-Patches/0562-Brand-support.patch rename to Spigot-Server-Patches/0561-Brand-support.patch diff --git a/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch b/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch index ea0759b9ee..63d4121f24 100644 --- a/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch +++ b/Spigot-Server-Patches/Add-setPlayerProfile-API-for-Skulls.patch @@ -51,10 +51,10 @@ diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java -@@ -0,0 +0,0 @@ package org.bukkit.craftbukkit.inventory; - import com.google.common.collect.ImmutableMap.Builder; +@@ -0,0 +0,0 @@ import com.google.common.collect.ImmutableMap.Builder; import com.mojang.authlib.GameProfile; import java.util.Map; + import java.util.UUID; +import com.destroystokyo.paper.profile.CraftPlayerProfile; +import com.destroystokyo.paper.profile.PlayerProfile; import net.minecraft.server.GameProfileSerializer; diff --git a/Spigot-Server-Patches/Fix-NPE-when-getting-location-from-InventoryEnderChe.patch b/Spigot-Server-Patches/Fix-NPE-when-getting-location-from-InventoryEnderChe.patch deleted file mode 100644 index 1e62d015f2..0000000000 --- a/Spigot-Server-Patches/Fix-NPE-when-getting-location-from-InventoryEnderChe.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Shane Freeder -Date: Sat, 10 Mar 2018 13:03:49 +0000 -Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened - by plugins - - -diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/InventoryEnderChest.java -+++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java -@@ -0,0 +0,0 @@ import org.bukkit.inventory.InventoryHolder; - - public class InventoryEnderChest extends InventorySubcontainer { - -- private TileEntityEnderChest a; -+ private TileEntityEnderChest a; public TileEntityEnderChest getTileEntity() { return a; } // Paper - OBFHELPER - // CraftBukkit start - private final EntityHuman owner; - -@@ -0,0 +0,0 @@ public class InventoryEnderChest extends InventorySubcontainer { - - @Override - public Location getLocation() { -+ if (getTileEntity() == null) return null; // Paper - return null if there is no TE bound (opened by plugin) - return new Location(this.a.getWorld().getWorld(), this.a.getPosition().getX(), this.a.getPosition().getY(), this.a.getPosition().getZ()); - } - diff --git a/Spigot-Server-Patches/Fix-this-stupid-bullshit.patch b/Spigot-Server-Patches/Fix-this-stupid-bullshit.patch index 17d990e8da..78ecbd7fe5 100644 --- a/Spigot-Server-Patches/Fix-this-stupid-bullshit.patch +++ b/Spigot-Server-Patches/Fix-this-stupid-bullshit.patch @@ -14,7 +14,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { - System.err.println("*** Error, this build is outdated ***"); + // Paper start - This is some stupid bullshit diff --git a/Spigot-Server-Patches/POM-Changes.patch b/Spigot-Server-Patches/POM-Changes.patch index 71ab781a8c..2c20c46419 100644 --- a/Spigot-Server-Patches/POM-Changes.patch +++ b/Spigot-Server-Patches/POM-Changes.patch @@ -207,7 +207,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + Date buildDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").parse(Main.class.getPackage().getImplementationVendor()); // Paper Calendar deadline = Calendar.getInstance(); - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java diff --git a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch index 6ccd8feeed..f9a0414736 100644 --- a/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch +++ b/Spigot-Server-Patches/Show-Paper-in-client-crashes-server-lists-and-Mojang.patch @@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -0,0 +0,0 @@ public class Main { - deadline.add(Calendar.DAY_OF_YEAR, -7); + deadline.add(Calendar.DAY_OF_YEAR, -21); if (buildDate.before(deadline.getTime())) { System.err.println("*** Error, this build is outdated ***"); - System.err.println("*** Please download a new build as per instructions from https://www.spigotmc.org/go/outdated-spigot ***"); diff --git a/work/CraftBukkit b/work/CraftBukkit index f8d4da08e1..a339310c48 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit f8d4da08e17c3b6e7147af8a945301535329bba3 +Subproject commit a339310c48548f0f82f923ff3f5fe2cdc7a8e8ba