parent
d4ae43fc00
commit
19de9af63c
624 changed files with 2369 additions and 2370 deletions
|
@ -1,4 +1,4 @@
|
|||
From abf4b44e9de9046faa4172331986876faaef5d7a Mon Sep 17 00:00:00 2001
|
||||
From db21e17ea6d14094bfc90f8883252c0725e386c3 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 4ff149fd9..bb3f7cdc1 100644
|
||||
index 4ff149fd..bb3f7cdc 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -141,4 +141,17 @@ public interface ItemFactory {
|
||||
|
@ -29,10 +29,10 @@ index 4ff149fd9..bb3f7cdc1 100644
|
|||
+ // Paper end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index bab86d804..44f3bec7d 100644
|
||||
index 9d9df827..8d9ebcb3 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -518,7 +518,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -534,7 +534,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,7 +41,7 @@ index bab86d804..44f3bec7d 100644
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -577,4 +577,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -593,4 +593,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -62,5 +62,5 @@ index bab86d804..44f3bec7d 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
2.25.0.windows.1
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue