Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 12:30:06 +01:00
Update upstream
Dieser Commit ist enthalten in:
Ursprung
29e39cbbc1
Commit
166eb8b489
@ -1,4 +1,4 @@
|
||||
From fd32275617a0d2891d8c394d86851638933edbb3 Mon Sep 17 00:00:00 2001
|
||||
From e840becdb579c898f7026e614c92b348b3b6a31f Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Thu, 28 May 2015 23:00:19 -0400
|
||||
Subject: [PATCH] Handle Item Meta Inconsistencies
|
||||
@ -204,7 +204,7 @@ index f4672b9a4..e2699564a 100644
|
||||
|
||||
static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index b2190b01d..f1430d226 100644
|
||||
index f10de8550..f21c1e846 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
@@ -8,12 +8,14 @@ import java.lang.reflect.Constructor;
|
||||
@ -274,7 +274,7 @@ index b2190b01d..f1430d226 100644
|
||||
for (int i = 0; i < ench.size(); i++) {
|
||||
String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
|
||||
@@ -573,13 +576,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
||||
void deserializeInternal(NBTTagCompound tag) {
|
||||
void deserializeInternal(NBTTagCompound tag, Object context) {
|
||||
}
|
||||
|
||||
- static Map<Enchantment, Integer> buildEnchantments(Map<String, Object> map, ItemMetaKey key) {
|
||||
|
@ -1,4 +1,4 @@
|
||||
From df8e9629b712132122452369684018f4c3926421 Mon Sep 17 00:00:00 2001
|
||||
From ca412bfa3f41d52e4dc3fa2b21e6f4375c6aa7bb Mon Sep 17 00:00:00 2001
|
||||
From: Zach Brown <zach.brown@destroystokyo.com>
|
||||
Date: Sat, 27 Jan 2018 17:04:14 -0500
|
||||
Subject: [PATCH] Add ArmorStand Item Meta
|
||||
@ -40,7 +40,7 @@ index e2699564a..aad380c3b 100644
|
||||
case TRAPPED_CHEST:
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
||||
new file mode 100644
|
||||
index 000000000..30941c7b0
|
||||
index 000000000..0e8acf12e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
||||
@@ -0,0 +1,309 @@
|
||||
@ -219,8 +219,8 @@ index 000000000..30941c7b0
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ void deserializeInternal(NBTTagCompound tag) {
|
||||
+ super.deserializeInternal(tag);
|
||||
+ void deserializeInternal(NBTTagCompound tag, Object context) {
|
||||
+ super.deserializeInternal(tag, context);
|
||||
+
|
||||
+ if (tag.hasKey(ENTITY_TAG.NBT)) {
|
||||
+ entityTag = tag.getCompound(ENTITY_TAG.NBT);
|
||||
@ -354,7 +354,7 @@ index 000000000..30941c7b0
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index f1430d226..a3f293e4c 100644
|
||||
index f21c1e846..a5fcf6bd5 100644
|
||||
--- a/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 {
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 0f4e33e9c7a5b3fc9912c67265b725db43fc92cb
|
||||
Subproject commit d6214b1988f3815e323c1c32c6885468ce21905e
|
@ -1 +1 @@
|
||||
Subproject commit ea7b61290a39f0ab355d7a723907ed312f713b05
|
||||
Subproject commit 210001701695ed79ae0b6b81e23125671913fe9c
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren