Update upstream
This commit is contained in:
parent
23ed74032c
commit
48d75228ed
49 changed files with 260 additions and 260 deletions
|
@ -1,4 +1,4 @@
|
|||
From 913761361c5a2b8da0f5eaa0ddfd7b6a18cc9ecc Mon Sep 17 00:00:00 2001
|
||||
From 7a4550bdfee62eaba02e50fe3434310cb0b82f8c 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
|
||||
|
@ -28,10 +28,10 @@ index 762c43d6..045c26d9 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 41a43053..24a45189 100644
|
||||
index 3c91cbe6..4940e726 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -488,7 +488,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -495,7 +495,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -45,7 +45,7 @@ index 41a43053..24a45189 100644
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -546,4 +551,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -553,4 +558,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue