Merge pull request #321 from MyPlayPlanet/falling-block-height-doEntityDrops

Make falling block height nerf respect doEntityDrops
2016-06-06 17:39:43 -05:00 · 2016-06-06 17:39:43 -05:00 · bdc783f176
Commit bdc783f176
--- a/Spigot-Server-Patches/Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/Drop-falling-block-and-tnt-entities-at-the-specified.patch
@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +            // Paper start - Configurable EntityFallingBlock height nerf
 +            if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
-+                if (this.dropItem) {
+                if (this.dropItem && this.world.getGameRules().getBoolean("doEntityDrops")) {
 +                    this.a(new ItemStack(block, 1, block.getDropData(this.block)), 0.0F);
 +                }
 +