mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-22 10:35:38 +01:00
[Auto] Updated Upstream (CraftBukkit)
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
b1d149cf SPIGOT-4489: NOTE_BLOCK incorrectly has BlockStateMeta
This commit is contained in:
Aikar
parent
a16e1a2fe7
commit
a939b01116
@ -1,4 +1,4 @@
|
||||
From 995ff17669ecc2be7d3a6b7350ec7d2e4bf7c74c Mon Sep 17 00:00:00 2001
|
||||
From 28e876d491ba820cc07a15dae470563eba5b7e31 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 22:43:12 -0400
|
||||
Subject: [PATCH] Implement ensureServerConversions API
|
||||
@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
|
||||
to ensure it meets latest minecraft expectations.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
index 5fc0283b22..be5f922cb6 100644
|
||||
index 52041caed..f5fa58d6c 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -295,4 +295,10 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -294,4 +294,10 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
|
||||
return ((CraftMetaItem) meta).updateMaterial(material);
|
||||
}
|
||||
@ -22,5 +22,5 @@ index 5fc0283b22..be5f922cb6 100644
|
||||
+ // Paper end
|
||||
}
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0 Mon Sep 17 00:00:00 2001
|
||||
From b1af484d9a636ef9e977a8584f4c3a9f08f54ed0 Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Wed, 4 May 2016 23:59:38 -0400
|
||||
Subject: [PATCH] Implement getI18NDisplayName
|
||||
@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
|
||||
You must replace the language file embedded in the server jar.
|
||||
|
||||
diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
||||
index 0648c76a0..bea146630 100644
|
||||
--- a/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
+++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
|
||||
@@ -39,10 +39,12 @@ public class LocaleLanguage {
|
||||
@ -25,10 +25,10 @@ index 7ac07ac07ac0..7ac07ac07ac0 100644
|
||||
return this.c(s);
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
index 7ac07ac07ac0..7ac07ac07ac0 100644
|
||||
index f5fa58d6c..3a6e6f687 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -300,5 +300,18 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@@ -299,5 +299,18 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
public ItemStack ensureServerConversions(ItemStack item) {
|
||||
return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7034e1b56e73ac61baa240bc969cf857f48f7fb7 Mon Sep 17 00:00:00 2001
|
||||
From 0ef5b7e0531f5bf10aa78276ce5bc886c820f81c 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
|
||||
@ -13,7 +13,7 @@ starting point for future additions in this area.
|
||||
Fixes GH-559
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
index caaed7cf0b..2672b004db 100644
|
||||
index 3a6e6f687..6a86cb7eb 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
|
||||
@@ -191,6 +191,8 @@ public final class CraftItemFactory implements ItemFactory {
|
||||
@ -26,7 +26,7 @@ index caaed7cf0b..2672b004db 100644
|
||||
case CHEST:
|
||||
case TRAPPED_CHEST:
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
index 2733cda407..e7daa95078 100644
|
||||
index d1a546c8f..284630f74 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -403,6 +403,8 @@ public final class CraftItemStack extends ItemStack {
|
||||
@ -40,7 +40,7 @@ index 2733cda407..e7daa95078 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 0000000000..0e8acf12e4
|
||||
index 000000000..0e8acf12e
|
||||
--- /dev/null
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
|
||||
@@ -0,0 +1,309 @@
|
||||
@ -354,7 +354,7 @@ index 0000000000..0e8acf12e4
|
||||
+ }
|
||||
+}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
index 6528668816..55afe8382c 100644
|
||||
index 081904dad..6a95f5fa3 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
|
||||
@@ -152,6 +152,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable {
|
||||
@ -383,7 +383,7 @@ index 6528668816..55afe8382c 100644
|
||||
}
|
||||
return HANDLED_TAGS;
|
||||
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
index d4f8e8c30c..e3065bf8d6 100644
|
||||
index 65b8123a8..0ad0004b9 100644
|
||||
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
@@ -8,6 +8,7 @@ import java.util.Arrays;
|
||||
@ -394,7 +394,7 @@ index d4f8e8c30c..e3065bf8d6 100644
|
||||
import net.minecraft.server.Block;
|
||||
import net.minecraft.server.IRegistry;
|
||||
import net.minecraft.server.ITileEntity;
|
||||
@@ -313,7 +314,18 @@ public class ItemMetaTest extends AbstractTestingBase {
|
||||
@@ -315,7 +316,18 @@ public class ItemMetaTest extends AbstractTestingBase {
|
||||
cleanStack.setItemMeta(meta);
|
||||
return cleanStack;
|
||||
}
|
||||
@ -414,5 +414,5 @@ index d4f8e8c30c..e3065bf8d6 100644
|
||||
|
||||
assertThat("Forgotten test?", providers, hasSize(ItemStackTest.COMPOUND_MATERIALS.length - 4/* Normal item meta, skulls, eggs and tile entities */));
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 13973782d74358e896bdd0aaa5c94fe5db3a9b76 Mon Sep 17 00:00:00 2001
|
||||
From 2ddf0a8c7dbaa6932de8309da5889c43f3d9e498 Mon Sep 17 00:00:00 2001
|
||||
From: Hugo Manrique <hugmanrique@gmail.com>
|
||||
Date: Thu, 26 Jul 2018 14:10:23 +0200
|
||||
Subject: [PATCH] Don't call getItemMeta on hasItemMeta
|
||||
@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
|
||||
Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
index d6e6b9bed4..3966769c5f 100644
|
||||
index 1282ee399..f41ccba79 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
|
||||
@@ -525,7 +525,7 @@ public final class CraftItemStack extends ItemStack {
|
||||
@@ -524,7 +524,7 @@ public final class CraftItemStack extends ItemStack {
|
||||
|
||||
@Override
|
||||
public boolean hasItemMeta() {
|
||||
@ -24,7 +24,7 @@ index d6e6b9bed4..3966769c5f 100644
|
||||
|
||||
static boolean hasItemMeta(net.minecraft.server.ItemStack item) {
|
||||
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
index e3065bf8d6..1b7790bf7e 100644
|
||||
index 0ad0004b9..7455461f1 100644
|
||||
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
|
||||
@@ -5,6 +5,7 @@ import static org.hamcrest.Matchers.*;
|
||||
@ -84,5 +84,5 @@ index e3065bf8d6..1b7790bf7e 100644
|
||||
public void testBlockStateMeta() {
|
||||
List<Block> queue = new ArrayList<>();
|
||||
--
|
||||
2.19.0
|
||||
2.19.1
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit c2035aa1d045bfa22fde511c50283b2494cca00e
|
||||
Subproject commit b1d149cfd00b5715474feb304d1bbc8fdffa9bd1
|
||||
Loading…
Reference in New Issue
Block a user