[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: 23c1a2ba Deprecate ItemStack durability methods in favour of ItemMeta Damageable as they are being frequently used incorrectly.
This commit is contained in:
parent
af53179713
commit
da126a405e
5 changed files with 16 additions and 16 deletions
|
@ -1,4 +1,4 @@
|
|||
From 7a4550bdfee62eaba02e50fe3434310cb0b82f8c Mon Sep 17 00:00:00 2001
|
||||
From 9756eecfa718f223ef7c239d82f8f06ff599f5bd 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 762c43d6..045c26d9 100644
|
||||
index ec2b8b8e..3012aec2 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 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 3c91cbe6..4940e726 100644
|
||||
index 2e44d4e2..fa9a06fc 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -495,7 +495,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -504,7 +504,12 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -45,7 +45,7 @@ index 3c91cbe6..4940e726 100644
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -553,4 +558,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -562,4 +567,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue