mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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 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
Download patch file Download diff file Expand all files Collapse all files

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