OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 07:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Aikar 2016-12-02 00:02:18 -05:00
parent 90c9266a32
commit e5b4e80232
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Spigot-Server-Patches/Process-NMS-Data-Conversion-post-ItemMeta-on-Copy.patch
View file

@ -14,8 +14,21 @@ erasing the NBT Tag.
On copy, run conversion post ItemMeta apply. 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
@@ -0,0 +0,0 @@ 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 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 66973051a..1218c005e 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java --- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -0,0 +0,0 @@ public final class ItemStack { @@ -0,0 +0,0 @@ public final class ItemStack {
@ -45,7 +58,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
this.save(savedStack); this.save(savedStack);
MinecraftServer.getServer().getDataConverterManager().a(DataConverterTypes.ITEM_INSTANCE, savedStack); // PAIL: convert 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 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 index 4afd3a99a..a862e946c 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack { @@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {

1
scripts/importmcdev.sh
View file

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