Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
97f920bf Fix suggest-player-names-when-null-tab-completions - Fixes #3803
166e52b5 [CI-SKIP] [Auto] Rebuild Patches
5a17ba07 Implements #3761 - Add entity liquid API (#3762)
e0cae289 Fix anvils bug - Fixes #3802
4793f774 Move bedrock config under unsupported, add comments to these configs
adf1de58 Allow delegation to vanilla chunk gen
40ace3f7 Allow delegation to vanilla chunk gen
178a6e50 Add PrepareResultEvent (#3776)
57697cd5 Report proxy onlinde mode to bstats as online (#3093)
6579ce05 Fix #3701 - Loottables erasing on viewing
030da7b8 [CI-SKIP] [Auto] Rebuild Patches
d43def79 Incorrect spawn reason for monsters from spawner - Fixes #3708 (#3764)
97b59df9 [Auto] Updated Upstream (CraftBukkit)
0543f051 [CI-SKIP] [Auto] Rebuild Patches
f3cd94c4 Remove streams from classes related to villager gossip (#3748)
b49104db add EntityTargetLivingEntityEvent for new 1.16 mobs (#3782)
4faf9703 Fix /plugins list not alphabetical to players (#3790)
7e03e44e [CI-SKIP] [Auto] Rebuild Patches
8bb00272 Update itemstack legacy name and lore (#3741)
6c87b6a0 [Auto] Updated Upstream (CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-07-05 02:45:06 -05:00
parent d337d76150
commit 329fb0f5ce
31 changed files with 203 additions and 370 deletions

View File

@@ -5,10 +5,10 @@ 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 2b2d914de..c2e57a976 100644
index a149321e72..41a8f43fc4 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -605,6 +605,7 @@ public final class ItemStack {
@@ -652,6 +652,7 @@ public final class ItemStack {
return this.tag;
}
@@ -16,15 +16,3 @@ index 2b2d914de..c2e57a976 100644
public NBTTagCompound a(String s) {
if (this.tag != null && this.tag.hasKeyOfType(s, 10)) {
return this.tag.getCompound(s);
diff --git a/src/main/java/net/minecraft/server/NBTTagString.java b/src/main/java/net/minecraft/server/NBTTagString.java
index 7ef237831..44121316c 100644
--- a/src/main/java/net/minecraft/server/NBTTagString.java
+++ b/src/main/java/net/minecraft/server/NBTTagString.java
@@ -40,6 +40,7 @@ public class NBTTagString implements NBTBase {
this.data = s;
}
+ public static NBTTagString create(String s) { return a(s); } // Purpur - OBFHELPER
public static NBTTagString a(String s) {
return s.isEmpty() ? NBTTagString.b : new NBTTagString(s);
}