Repo-Mirror/OldSliceMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-23 18:57:54 -04:00
parent 4608731dca
commit 9a17bddf12
16 changed files with 70 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Spigot-Server-Patches/0268-ItemStack-getMaxItemUseDuration.patch
View File

@@ -1,4 +1,4 @@
From 425c25691fe2dd228b01f6e4b20eb050440a85c5 Mon Sep 17 00:00:00 2001
From 2e865fce8dd06dc0afb86b40b01167f00593e59e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jun 2018 23:00:29 -0400
Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,10 +6,10 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
Allows you to determine how long it takes to use a usable/consumable item
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 023dd48a23..00691f6de9 100644
index e71d75a77..3c7a40c23 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -524,6 +524,7 @@ public final class ItemStack {
@@ -512,6 +512,7 @@ public final class ItemStack {
this.getItem().b(this, world, entityhuman);
}
@@ -18,10 +18,10 @@ index 023dd48a23..00691f6de9 100644
return this.getItem().c(this);
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index b1e0d61856..03f6115181 100644
index aad380c3b..5f3331de1 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -182,6 +182,13 @@ public final class CraftItemStack extends ItemStack {
@@ -183,6 +183,13 @@ public final class CraftItemStack extends ItemStack {
return (handle == null) ? Material.AIR.getMaxStackSize() : handle.getItem().getMaxStackSize();
}