OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-29 11:42:55 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Auto] Updated Upstream (CraftBukkit)

Browse source 
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

CraftBukkit Changes:
82f4b3b1 SPIGOT-4292: Ignore itemstacks with invalid enchants
This commit is contained in:
Aikar 2018-08-19 22:54:42 -04:00
parent 41ecb86304
commit 3a4b892146
No known key found for this signature in database
GPG key ID: 401ADFC9891FAAFE
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch
View file

@ -1,4 +1,4 @@
From 49bff188ac93c1d1401f4870e0a5dbadba2ae28f Mon Sep 17 00:00:00 2001 From ce65b11d86cfceb4f0a150f7a1eae6c7075cea87 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 27 Jan 2018 17:04:14 -0500 Date: Sat, 27 Jan 2018 17:04:14 -0500
Subject: [PATCH] Add ArmorStand Item Meta Subject: [PATCH] Add ArmorStand Item Meta
@ -26,10 +26,10 @@ index 3dbe9d81e..22b9674da 100644
case CHEST: case CHEST:
case TRAPPED_CHEST: case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index ed49a5828..70b05eeaa 100644 index 69425e838..bdd4bf515 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -394,6 +394,8 @@ public final class CraftItemStack extends ItemStack { @@ -397,6 +397,8 @@ public final class CraftItemStack extends ItemStack {
return new CraftMetaSpawnEgg(item.getTag()); return new CraftMetaSpawnEgg(item.getTag());
case KNOWLEDGE_BOOK: case KNOWLEDGE_BOOK:
return new CraftMetaKnowledgeBook(item.getTag()); return new CraftMetaKnowledgeBook(item.getTag());
@ -354,7 +354,7 @@ index 000000000..0e8acf12e
+ } + }
+} +}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index 1d3333fd7..0990e7b3c 100644 index 3fd208803..360e1fd54 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable { @@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {

6
Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch
View file

@ -1,4 +1,4 @@
From 806e1b68cdd3f0484107a826448800c5d3f6b3d0 Mon Sep 17 00:00:00 2001 From 09f252112d9099a08fd7a70dd245e3e3ca68f14d Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com> From: Hugo Manrique <hugmanrique@gmail.com>
Date: Thu, 26 Jul 2018 14:10:23 +0200 Date: Thu, 26 Jul 2018 14:10:23 +0200
Subject: [PATCH] Don't call getItemMeta on hasItemMeta Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index ad8a176d6..c9d1999a4 100644 index 911463f5b..974321df8 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -516,7 +516,7 @@ public final class CraftItemStack extends ItemStack { @@ -519,7 +519,7 @@ public final class CraftItemStack extends ItemStack {
@Override @Override
public boolean hasItemMeta() { public boolean hasItemMeta() {

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e Subproject commit 82f4b3b1d97e08fb649a5e461aa98e335021fe26