Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
73fc9666 Fix per-world settings not reloading (#4756)
94c99a8d Fix NPE thrown when converting MerchantRecipe from Bukkit to NMS (#4755)
072faf2a Fix minor issue with JavaDoc breaking doc deploys
This commit is contained in:
BillyGalbreath
2020-11-11 23:27:30 -06:00
parent b85092b2bf
commit 5796ff9f94
80 changed files with 287 additions and 314 deletions

View File

@@ -0,0 +1,18 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 1 Jan 2020 20:12:39 -0600
Subject: [PATCH] Add obfhelpers for plugin use
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index e7759f248..2c908a604 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -644,6 +644,7 @@ public final class ItemStack {
return this.tag;
}
+ public NBTTagCompound getOrCreateSubTag(String s) { return a(s); } // Purpur - OBFHELPER
public NBTTagCompound a(String s) {
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
return this.tag.getCompound(s);