a923e332ee
Also adds per-world spawn limit config in paper.yml for `underground_water_creature`, and migrates existing spawn limit config options to their Mojang names.
47 lines
2.5 KiB
Diff
47 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 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 097991f2dd8d35fd5bc62e23e7361d47e70da493..4bda78d36a64e89bc68885a2a10b40a759720d1a 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -347,4 +347,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/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
index 1d538f490c7aa48991446fb55c7f0916bb5d5e29..69f385c57f3716a489781debb32b4adf1cb9383d 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java
|
|
@@ -309,6 +309,18 @@ public class FallingBlockEntity extends Entity {
|
|
@Override
|
|
protected void readAdditionalSaveData(CompoundTag nbt) {
|
|
this.blockState = NbtUtils.readBlockState(nbt.getCompound("BlockState"));
|
|
+ // Paper start - Block FallingBlocks with Command Blocks
|
|
+ final Block b = this.blockState.getBlock();
|
|
+ if (this.level.paperConfig.filterNBTFromSpawnEgg
|
|
+ && (b == Blocks.COMMAND_BLOCK
|
|
+ || b == Blocks.REPEATING_COMMAND_BLOCK
|
|
+ || b == Blocks.CHAIN_COMMAND_BLOCK
|
|
+ || b == Blocks.JIGSAW
|
|
+ || b == Blocks.STRUCTURE_BLOCK
|
|
+ || b instanceof net.minecraft.world.level.block.GameMasterBlock)) {
|
|
+ this.blockState = Blocks.STONE.defaultBlockState();
|
|
+ }
|
|
+ // Paper end
|
|
this.time = nbt.getInt("Time");
|
|
if (nbt.contains("HurtEntities", 99)) {
|
|
this.hurtEntities = nbt.getBoolean("HurtEntities");
|