Update Upstream

This commit is contained in:
Spottedleaf 2019-05-05 19:58:04 -07:00
parent cb24079b77
commit eeb2ecd789
348 changed files with 1661 additions and 1710 deletions

View file

@ -1,4 +1,4 @@
From ae030eb68664e246e3610cd6e0b9eb66c7b75bc3 Mon Sep 17 00:00:00 2001
From 005245b4911271b4f13791ff70746dc694f9b531 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API
@ -29,10 +29,10 @@ index cbcbe8c8..8e602cf5 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 7b709457..4ee01be5 100644
index bab86d80..44f3bec7 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -517,7 +517,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
}
}
@ -41,7 +41,7 @@ index 7b709457..4ee01be5 100644
}
/**
@@ -576,4 +576,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@@ -577,4 +577,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
return true;
}