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

Update upstream B/CB

Browse source 
--- work/Bukkit
Submodule work/Bukkit 538ceaff..d6b23768:
  > SPIGOT-5534: ItemStack copy constructor can cause legacy layer to load

--- work/CraftBukkit
Submodule work/CraftBukkit efd6cf55..a81f6ed3:
  > SPIGOT-5532: Material.values() yields an exception
This commit is contained in:
Zach Brown 2020-01-21 21:06:28 -06:00
parent a55f66b607
commit 1b14d02fe2
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Spigot-API-Patches/Add-getI18NDisplayName-API.patch
View file

@ -29,7 +29,7 @@ index bb3f7cdc..3cada348 100644
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 8d9ebcb3..65aa1c4e 100644
index ca6d1233..8adf9399 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

2
Spigot-API-Patches/Flip-some-Spigot-API-null-annotations.patch
View file

@ -105,7 +105,7 @@ index 3cada348..03ba2265 100644
/**
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index dfe52817..19e0852c 100644
index f2c3d2ac..5426e7c2 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ import java.util.Set; // Paper

2
Spigot-API-Patches/ItemStack-API-additions-for-quantity-flags-lore.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] ItemStack API additions for quantity/flags/lore
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index bb5a4712..dfe52817 100644
index 7d2c5747..f2c3d2ac 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ package org.bukkit.inventory;

2
Spigot-API-Patches/ItemStack-getMaxItemUseDuration.patch
View file

@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
Allows you to determine how long it takes to use a usable/consumable item
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 65aa1c4e..bb5a4712 100644
index 8adf9399..7d2c5747 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

2
Spigot-API-Patches/ensureServerConversions-API.patch
View file

@ -29,7 +29,7 @@ index 4ff149fd..bb3f7cdc 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 9d9df827..8d9ebcb3 100644
index 180c292f..ca6d1233 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -0,0 +0,0 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

2
work/Bukkit

@ -1 +1 @@
Subproject commit 538ceaff0e2c94f8deaf44fbf35e6024938c67b5
Subproject commit d6b23768eeefee2861cd0492e24f0d699e4389f1

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit efd6cf55fc925d15ba0961f2457e8ae5b88cc718
Subproject commit a81f6ed397d2347cc6eae241d123c399ba0db40a