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

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:
Zach Brown 2020-01-21 21:06:28 -06:00
parent 79710332e3
commit 19ff55ef0d
No known key found for this signature in database
GPG Key ID: CC9DA35FC5450B76
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] ensureServerConversions API Subject: [PATCH] ensureServerConversions API
@ -29,10 +29,10 @@ index 4ff149fd..bb3f7cdc 100644
+ // 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 9d9df827..8d9ebcb3 100644 index 180c292f..ca6d1233 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
@@ -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; return true;
} }
@ -62,5 +62,5 @@ index 9d9df827..8d9ebcb3 100644
+ // Paper end + // Paper end
} }
-- --
2.25.0.windows.1 2.25.0

8
Spigot-API-Patches/0062-Add-getI18NDisplayName-API.patch
View File

@ -1,4 +1,4 @@
From 5be3ee85ce36300d867bfa63eea2334d876527d8 Mon Sep 17 00:00:00 2001 From 3f4a17835ea5512030e329f447171e75323f9bf9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 23:55:48 -0400 Date: Wed, 4 May 2016 23:55:48 -0400
Subject: [PATCH] Add getI18NDisplayName API Subject: [PATCH] Add getI18NDisplayName API
@ -29,10 +29,10 @@ index bb3f7cdc..3cada348 100644
// 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 8d9ebcb3..65aa1c4e 100644 index ca6d1233..8adf9399 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
@@ -607,5 +607,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -609,5 +609,17 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public ItemStack ensureServerConversions() { public ItemStack ensureServerConversions() {
return Bukkit.getServer().getItemFactory().ensureServerConversions(this); return Bukkit.getServer().getItemFactory().ensureServerConversions(this);
} }
@ -51,5 +51,5 @@ index 8d9ebcb3..65aa1c4e 100644
// Paper end // Paper end
} }
-- --
2.25.0.windows.1 2.25.0

8
Spigot-API-Patches/0105-ItemStack-getMaxItemUseDuration.patch
View File

@ -1,4 +1,4 @@
From 0a804e62de45bd9c8d9c3b8a716863a961555d6a Mon Sep 17 00:00:00 2001 From 8a8c8d26dae2e332dd944219e0decc1c342d210e Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Tue, 5 Jun 2018 22:59:50 -0400 Date: Tue, 5 Jun 2018 22:59:50 -0400
Subject: [PATCH] ItemStack#getMaxItemUseDuration 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 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 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 --- 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
@@ -619,5 +619,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -621,5 +621,13 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
public String getI18NDisplayName() { public String getI18NDisplayName() {
return Bukkit.getServer().getItemFactory().getI18NDisplayName(this); return Bukkit.getServer().getItemFactory().getI18NDisplayName(this);
} }
@ -24,5 +24,5 @@ index 65aa1c4e..bb5a4712 100644
// Paper end // Paper end
} }
-- --
2.25.0.windows.1 2.25.0

8
Spigot-API-Patches/0113-ItemStack-API-additions-for-quantity-flags-lore.patch
View File

@ -1,11 +1,11 @@
From e5ede7fbb14ecb653eb8874602a8c1d228de6534 Mon Sep 17 00:00:00 2001 From 974f48ac97eeaf72bded760309c0454758e766b6 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Fri, 22 Jun 2018 22:59:18 -0400 Date: Fri, 22 Jun 2018 22:59:18 -0400
Subject: [PATCH] ItemStack API additions for quantity/flags/lore 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 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 --- 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
@@ -2,7 +2,9 @@ package org.bukkit.inventory; @@ -2,7 +2,9 @@ package org.bukkit.inventory;
@ -18,7 +18,7 @@ index bb5a4712..dfe52817 100644
import org.apache.commons.lang.Validate; import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@@ -627,5 +629,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -629,5 +631,140 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
// Requires access to NMS // Requires access to NMS
return ensureServerConversions().getMaxItemUseDuration(); return ensureServerConversions().getMaxItemUseDuration();
} }
@ -160,5 +160,5 @@ index bb5a4712..dfe52817 100644
// Paper end // Paper end
} }
-- --
2.25.0.windows.1 2.25.0

8
Spigot-API-Patches/0178-Flip-some-Spigot-API-null-annotations.patch
View File

@ -1,4 +1,4 @@
From 82d88fc0c93750b65215391f6570a68680cccca8 Mon Sep 17 00:00:00 2001 From 0d5124c6ebb38a898767c1b991bafecacc3bc1dd Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Sun, 24 Mar 2019 18:39:01 -0400 Date: Sun, 24 Mar 2019 18:39:01 -0400
Subject: [PATCH] Flip some Spigot API null annotations Subject: [PATCH] Flip some Spigot API null annotations
@ -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 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 --- 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
@@ -8,6 +8,7 @@ import java.util.Set; // Paper @@ -8,6 +8,7 @@ import java.util.Set; // Paper
@ -116,7 +116,7 @@ index dfe52817..19e0852c 100644
import org.bukkit.Utility; import org.bukkit.Utility;
import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerializable;
import org.bukkit.enchantments.Enchantment; import org.bukkit.enchantments.Enchantment;
@@ -544,7 +545,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable { @@ -546,7 +547,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
* *
* @return a copy of the current ItemStack's ItemData * @return a copy of the current ItemStack's ItemData
*/ */
@ -126,5 +126,5 @@ index dfe52817..19e0852c 100644
return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone(); return this.meta == null ? Bukkit.getItemFactory().getItemMeta(this.type) : this.meta.clone();
} }
-- --
2.25.0.windows.1 2.25.0

2
work/Bukkit

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

2
work/CraftBukkit

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