07d0098a9e
Adds /paper command for reloading the paper config. Closes GH-639 Per-world config logging has been removed in favor of all or nothing logging for all paper settings. I don't believe it was used enough to warrant maintaining. If this is not the case it should be possible to re-add it.
61 lines
2.7 KiB
Diff
61 lines
2.7 KiB
Diff
From 54abcccc1027dc80e9fd95a4fe70f473213b19b2 Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Tue, 1 Mar 2016 14:27:13 -0600
|
|
Subject: [PATCH] Configurable speed for water flowing over lava
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
index 8cdeb34d4..62e6830aa 100644
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
|
@@ -131,4 +131,10 @@ public class PaperWorldConfig {
|
|
if (fallingBlockHeightNerf != 0) log("Falling Block Height Limit set to Y: " + fallingBlockHeightNerf);
|
|
if (entityTNTHeightNerf != 0) log("TNT Entity Height Limit set to Y: " + entityTNTHeightNerf);
|
|
}
|
|
+
|
|
+ public int waterOverLavaFlowSpeed;
|
|
+ private void waterOverLawFlowSpeed() {
|
|
+ waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
|
|
+ log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
|
|
+ }
|
|
}
|
|
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
index c9294a58d..f4ac7bafa 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
@@ -30,7 +30,7 @@ public class BlockFlowing extends BlockFluids {
|
|
b0 = 2;
|
|
}
|
|
|
|
- int j = this.a(world);
|
|
+ int j = this.getFlowSpeed(world, blockposition); // Paper
|
|
int k;
|
|
|
|
if (i > 0) {
|
|
@@ -261,8 +261,22 @@ public class BlockFlowing extends BlockFluids {
|
|
|
|
public void onPlace(World world, BlockPosition blockposition, IBlockData iblockdata) {
|
|
if (!this.e(world, blockposition, iblockdata)) {
|
|
- world.a(blockposition, (Block) this, this.a(world));
|
|
+ world.a(blockposition, (Block) this, this.getFlowSpeed(world, blockposition)); // Paper
|
|
}
|
|
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Paper - Get flow speed. Throttle if its water and flowing adjacent to lava
|
|
+ */
|
|
+ public int getFlowSpeed(World world, BlockPosition blockposition) {
|
|
+ if (this.material == Material.WATER && (
|
|
+ world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
|
|
+ world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
|
|
+ world.getType(blockposition.west(1)).getBlock().material == Material.LAVA ||
|
|
+ world.getType(blockposition.east(1)).getBlock().material == Material.LAVA)) {
|
|
+ return world.paperConfig.waterOverLavaFlowSpeed;
|
|
+ }
|
|
+ return super.a(world);
|
|
+ }
|
|
}
|
|
--
|
|
2.12.0.windows.1
|
|
|