Update upstream B/CB
--- 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:
parent
79710332e3
commit
19ff55ef0d
7 changed files with 23 additions and 23 deletions
|
@ -1,4 +1,4 @@
|
|||
From db21e17ea6d14094bfc90f8883252c0725e386c3 Mon Sep 17 00:00:00 2001
|
||||
From 246d7a5d7608b26b9749a52b8d2bd16dc34c0aa5 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
|
||||
|
@ -29,10 +29,10 @@ 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
|
||||
@@ -534,7 +534,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -536,7 +536,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -41,7 +41,7 @@ index 9d9df827..8d9ebcb3 100644
|
|||
}
|
||||
|
||||
/**
|
||||
@@ -593,4 +593,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
@@ -595,4 +595,19 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
|
||||
|
||||
return true;
|
||||
}
|
||||
|
@ -62,5 +62,5 @@ index 9d9df827..8d9ebcb3 100644
|
|||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.25.0.windows.1
|
||||
2.25.0
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue