core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI-SKIP] fix minecart vs minecraft typos (#5713)

This commit is contained in:
Gergely Sarkozi 2021-05-23 16:11:06 +02:00 committed by GitHub
parent f775e87b4e
commit 7aabe7d56b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Spigot-API-Patches/0061-ensureServerConversions-API.patch
View File

@ -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. 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 diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..845119c9ba9dc2719dc67b0edb0ff2ad58656bde 100644 index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..42551f8aa6666a6144815b619327c6d8f3c3776b 100644
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java --- a/src/main/java/org/bukkit/inventory/ItemFactory.java
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java +++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
@@ -160,5 +160,17 @@ public interface ItemFactory { @@ -160,5 +160,17 @@ public interface ItemFactory {
@ -16,7 +16,7 @@ index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..845119c9ba9dc2719dc67b0edb0ff2ad
net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack); net.kyori.adventure.text.Component displayName(@NotNull ItemStack itemStack);
+ +
+ /** + /**
+ * Minecart updates are converting simple item stacks into more complex NBT oriented Item Stacks. + * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
+ * + *
+ * Use this method to to ensure any desired data conversions are processed. + * Use this method to to ensure any desired data conversions are processed.
+ * The input itemstack will not be the same as the returned itemstack. + * The input itemstack will not be the same as the returned itemstack.
@ -29,7 +29,7 @@ index 6cc4bad2ecd19f44a680ff03cbfb99d48ea5c337..845119c9ba9dc2719dc67b0edb0ff2ad
// Paper end // Paper end
} }
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index a15abec467bac70116a6fc21a300d4930b909f15..1c69ca6a6d0e956d796827159236ee3466813d0e 100644 index a15abec467bac70116a6fc21a300d4930b909f15..f9d226962f16821d07ac80f1bf69cb01a5de2654 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java --- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java +++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor @@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, net.kyor
@ -47,7 +47,7 @@ index a15abec467bac70116a6fc21a300d4930b909f15..1c69ca6a6d0e956d796827159236ee34
} }
+ +
+ /** + /**
+ * Minecart updates are converting simple item stacks into more complex NBT oriented Item Stacks. + * Minecraft updates are converting simple item stacks into more complex NBT oriented Item Stacks.
+ * + *
+ * Use this method to to ensure any desired data conversions are processed. + * Use this method to to ensure any desired data conversions are processed.
+ * The input itemstack will not be the same as the returned itemstack. + * The input itemstack will not be the same as the returned itemstack.