mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-26 12:36:07 +01:00
0d3b35c339
This option does not set the absolute speed of the entity as the name implies. It sets a modifier. The default (vanilla) value of `0.5` sets the baby zombie to move at 50% faster than the base speed. A negative value like `-0.4` would set them to move at 40% slower. There should be no functional changes as a result of this change, it's just clarifying the config name.
78 lines
3.6 KiB
Diff
78 lines
3.6 KiB
Diff
From 27fb70c36afb3d6838aaeb9d22dc04797b2ec7ef Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Tue, 1 Mar 2016 14:14:15 -0600
|
|
Subject: [PATCH] Drop falling block and tnt entities at the specified height
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 625e75f93..17ee44ae5 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -119,4 +119,14 @@ public class PaperWorldConfig {
|
|
keepSpawnInMemory = getBoolean("keep-spawn-loaded", true);
|
|
log("Keep spawn chunk loaded: " + keepSpawnInMemory);
|
|
}
|
|
+
|
|
+ public int fallingBlockHeightNerf;
|
|
+ public int entityTNTHeightNerf;
|
|
+ private void heightNerfs() {
|
|
+ fallingBlockHeightNerf = getInt("falling-block-height-nerf", 0);
|
|
+ entityTNTHeightNerf = getInt("tnt-entity-height-nerf", 0);
|
|
+
|
|
+ if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
|
|
+ if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index fd4712c71..40dcb3125 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -1838,6 +1838,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
|
|
return this.a(itemstack, 0.0F);
|
|
}
|
|
|
|
+ @Nullable public final EntityItem dropItem(ItemStack itemstack, float offset) { return this.a(itemstack, offset); } // Paper - OBFHELPER
|
|
@Nullable
|
|
public EntityItem a(ItemStack itemstack, float f) {
|
|
if (itemstack.isEmpty()) {
|
|
diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
index dff903b6a..f8d8d8f35 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
|
|
@@ -88,6 +88,16 @@ public class EntityFallingBlock extends Entity {
|
|
}
|
|
|
|
this.move(EnumMoveType.SELF, this.getMot());
|
|
+
|
|
+ // Paper start - Configurable EntityFallingBlock height nerf
|
|
+ if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
|
|
+ if (this.dropItem && this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {
|
|
+ this.a(block);
|
|
+ }
|
|
+
|
|
+ this.die();
|
|
+ }
|
|
+ // Paper end
|
|
if (!this.world.isClientSide) {
|
|
blockposition = new BlockPosition(this);
|
|
boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
|
|
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
index 775192a59..e988abd67 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
|
|
@@ -57,6 +57,11 @@ public class EntityTNTPrimed extends Entity {
|
|
}
|
|
|
|
this.move(EnumMoveType.SELF, this.getMot());
|
|
+ // Paper start - Configurable TNT entity height nerf
|
|
+ if (this.world.paperConfig.entityTNTHeightNerf != 0 && this.locY > this.world.paperConfig.entityTNTHeightNerf) {
|
|
+ this.die();
|
|
+ }
|
|
+ // Paper end
|
|
this.setMot(this.getMot().a(0.98D));
|
|
if (this.onGround) {
|
|
this.setMot(this.getMot().d(0.7D, -0.5D, 0.7D));
|
|
--
|
|
2.23.0
|
|
|