mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-10 05:34:59 +02:00
66 lines
3.1 KiB
Diff
66 lines
3.1 KiB
Diff
From db92f996bf62c9b3e5d6627dd6628559d7c8d24b Mon Sep 17 00:00:00 2001
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
Date: Sat, 12 Nov 2016 23:25:22 -0600
|
|
Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 4ad072a..73bf744 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -391,4 +391,12 @@ public class PaperWorldConfig {
|
|
private void removeCorruptTEs() {
|
|
removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
|
|
}
|
|
+
|
|
+ public boolean filterNBTFromSpawnEgg = true;
|
|
+ private void fitlerNBTFromSpawnEgg() {
|
|
+ filterNBTFromSpawnEgg = getBoolean("filter-nbt-data-from-spawn-eggs-and-related", true);
|
|
+ if (!filterNBTFromSpawnEgg) {
|
|
+ Bukkit.getLogger().warning("Spawn Egg and Armor Stand NBT filtering disabled, this is a potential security risk");
|
|
+ }
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
index 8059e6d..a4f465e 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
@@ -251,6 +251,14 @@ public class EntityFallingBlock extends Entity {
|
|
this.block = Block.getById(nbttagcompound.getByte("Tile") & 255).fromLegacyData(i);
|
|
}
|
|
|
|
+ // Paper start - Block FallingBlocks with Command Blocks
|
|
+ // Check mappings on update - dc = "repeating_command_block" - dd = "chain_command_block"
|
|
+ final Block b = this.block.getBlock();
|
|
+ if (this.world.paperConfig.filterNBTFromSpawnEgg && (b == Blocks.COMMAND_BLOCK || b == Blocks.dc || b == Blocks.dd)) {
|
|
+ this.block = Blocks.STONE.getBlockData();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
this.ticksLived = nbttagcompound.getInt("Time");
|
|
Block block = this.block.getBlock();
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
index 1a01a57..f914ad4 100644
|
|
--- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
+++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
|
|
@@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
|
|
NBTTagCompound nbttagcompound1 = entity.e(new NBTTagCompound());
|
|
UUID uuid = entity.getUniqueID();
|
|
|
|
- nbttagcompound1.a(nbttagcompound.getCompound("EntityTag"));
|
|
+ // Paper start - Filter out position and motion information
|
|
+ final NBTTagCompound entityTag = nbttagcompound.getCompound("EntityTag");
|
|
+ if (world.paperConfig.filterNBTFromSpawnEgg) {
|
|
+ entityTag.remove("Pos");
|
|
+ entityTag.remove("Motion");
|
|
+ }
|
|
+ nbttagcompound1.a(entityTag);
|
|
+ // Paper end
|
|
entity.a(uuid);
|
|
entity.f(nbttagcompound1);
|
|
}
|
|
--
|
|
2.9.3
|
|
|