Update to Minecraft 1.16.1

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions

View File

@@ -1,26 +1,26 @@
--- a/net/minecraft/server/RecipeItemStack.java
+++ b/net/minecraft/server/RecipeItemStack.java
@@ -28,6 +28,7 @@
private final RecipeItemStack.Provider[] c;
@@ -25,6 +25,7 @@
private final RecipeItemStack.Provider[] b;
public ItemStack[] choices;
private IntList e;
private IntList d;
+ public boolean exact; // CraftBukkit
public RecipeItemStack(Stream<? extends RecipeItemStack.Provider> stream) {
this.c = (RecipeItemStack.Provider[]) stream.filter(RecipeItemStack.b).toArray((i) -> {
@@ -59,6 +60,15 @@
for (int j = 0; j < i; ++j) {
ItemStack itemstack1 = aitemstack[j];
this.b = (RecipeItemStack.Provider[]) stream.toArray((i) -> {
@@ -57,6 +58,15 @@
for (int j = 0; j < i; ++j) {
ItemStack itemstack1 = aitemstack[j];
+ // CraftBukkit start
+ if (exact) {
+ if (itemstack1.getItem() == itemstack.getItem() && ItemStack.equals(itemstack, itemstack1)) {
+ return true;
+ }
+ // CraftBukkit start
+ if (exact) {
+ if (itemstack1.getItem() == itemstack.getItem() && ItemStack.equals(itemstack, itemstack1)) {
+ return true;
+ }
+
+ continue;
+ }
+ // CraftBukkit end
if (itemstack1.getItem() == itemstack.getItem()) {
return true;
}
+ continue;
+ }
+ // CraftBukkit end
if (itemstack1.getItem() == itemstack.getItem()) {
return true;
}