[Auto] Updated Upstream (Bukkit)
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 28237f03 SPIGOT-4330: Improve isSimilar for legacy stacks
This commit is contained in:
parent
f8b40558fd
commit
5e7e79880e
5 changed files with 16 additions and 16 deletions
|
@ -1,4 +1,4 @@
|
|||
From 9756eecfa718f223ef7c239d82f8f06ff599f5bd Mon Sep 17 00:00:00 2001
|
||||
From 2d6c06d66fa0bb54e1e769dc71adbb750c64225d 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
|
||||
|
@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
|
|||
to ensure it meets latest minecraft expectations.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
index ec2b8b8e..3012aec2 100644
|
||||
index ec2b8b8ed..3012aec22 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -134,4 +134,16 @@ public interface ItemFactory {
|
||||
|
@ -28,10 +28,10 @@ index ec2b8b8e..3012aec2 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 2e44d4e2..fa9a06fc 100644
|
||||
index c744799f6..5e8de1152 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -504,7 +504,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -506,7 +506,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -45,7 +45,7 @@ index 2e44d4e2..fa9a06fc 100644
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -562,4 +567,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -564,4 +569,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue