aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Panzer <[email protected]>2016-06-06 21:14:35 +0200
committerMartin Panzer <[email protected]>2016-06-06 21:14:35 +0200
commitcf65e06d966649fa53f3b6b70bca3c157cf3c9a4 (patch)
treecd9ea65f7aef078dc5c96da2a3139e35c73e6736
parentb394ec047236138350857b347cee8a07203c72a6 (diff)
downloadPaper-cf65e06d966649fa53f3b6b70bca3c157cf3c9a4.tar.gz
Paper-cf65e06d966649fa53f3b6b70bca3c157cf3c9a4.zip
Make falling block height nerf respect doEntityDrops
-rw-r--r--Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
index e6db47365e..083cba37b3 100644
--- a/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
+++ b/Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch
@@ -1,4 +1,4 @@
-From a0937231e2595d3b2ce3795d3fca5e36bbee8980 Mon Sep 17 00:00:00 2001
+From 7d0cc5ff146d3fbf97eb9006f7013fca14c14eea Mon Sep 17 00:00:00 2001
From: Byteflux <[email protected]>
Date: Tue, 1 Mar 2016 14:14:15 -0600
Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,7 +24,7 @@ index 78dcf26..f19ae97 100644
+ }
}
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 0b2c5d7..08a7969 100644
+index 0b2c5d7..5ec5e44 100644
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -77,6 +77,17 @@ public class EntityFallingBlock extends Entity {
@@ -34,7 +34,7 @@ index 0b2c5d7..08a7969 100644
+
+ // 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);
+ }
+
@@ -64,5 +64,5 @@ index 35ed2a6..564ea37 100644
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D;
--
-2.8.2
+1.9.1