TakeV
/
Paper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ignore "Unable to resolve BlockEntity" debug messages - Fixes #489

This commit is contained in:
Aikar 2016-12-02 00:02:18 -05:00
parent 357b402cbc
commit 5d1cc02e6a
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Spigot-Server-Patches/0167-Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
View File

@ -1,4 +1,4 @@
From 20ef4d01bb477b3675c0a68d71e8850634d67ce9 Mon Sep 17 00:00:00 2001
From ba3e15745ed9c595c8b787eff25b4092ab524e97 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 4 May 2016 22:31:18 -0400
Subject: [PATCH] Process NMS Data Conversion post ItemMeta on Copy
@ -14,8 +14,21 @@ erasing the NBT Tag.
On copy, run conversion post ItemMeta apply.
diff --git a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
index 4a8820e68..27fb802bf 100644
--- a/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
+++ b/src/main/java/net/minecraft/server/DataInspectorBlockEntity.java
@@ -32,7 +32,7 @@ public class DataInspectorBlockEntity implements DataInspector {
boolean flag;
if (s1 == null) {
- DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s});
+ //DataInspectorBlockEntity.a.warn("Unable to resolve BlockEntity for ItemInstance: {}", new Object[] { s}); // Paper - no need to nag about an ok condition
flag = false;
} else {
flag = !nbttagcompound2.hasKey("id");
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index dbe9a9c..394a877 100644
index 66973051a..1218c005e 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -55,13 +55,24 @@ public final class ItemStack {
@ -45,7 +58,7 @@ index dbe9a9c..394a877 100644
this.save(savedStack);
MinecraftServer.getServer().getDataConverterManager().a(DataConverterTypes.ITEM_INSTANCE, savedStack); // PAIL: convert
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 9ae05b3..18451fd 100644
index 4afd3a99a..a862e946c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -41,10 +41,11 @@ public final class CraftItemStack extends ItemStack {
@ -62,5 +75,5 @@ index 9ae05b3..18451fd 100644
}
--
2.10.2
2.11.0

1
scripts/importmcdev.sh
View File

@ -56,6 +56,7 @@ import CommandScoreboard
import CommandWhitelist
import DataBits
import DataConverterMaterialId
import DataInspectorBlockEntity
import DefinedStructure
import EULA
import EntitySquid