Paper/Spigot-Server-Patches/0052-Fast-draining.patch

102 lines
4.7 KiB
Diff
Raw Normal View History

2015-10-03 05:58:02 +02:00
From f52fd3b116d6cfbbe30bf9d80fd890c7938be025 Mon Sep 17 00:00:00 2001
2015-07-01 05:22:24 +02:00
From: Byteflux <byte@byteflux.net>
2015-10-03 05:58:02 +02:00
Date: Tue, 30 Jun 2015 19:31:02 -0700
2015-07-01 05:22:24 +02:00
Subject: [PATCH] Fast draining
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
2015-07-03 21:38:43 +02:00
index ab2e43f..fc3fc48 100644
2015-07-01 05:22:24 +02:00
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -74,7 +74,7 @@ public class BlockFlowing extends BlockFluids {
}
}
- if (this.material == Material.LAVA && i < 8 && i1 < 8 && i1 > i && random.nextInt(4) != 0) {
+ if (!world.paperSpigotConfig.fastDrainLava && this.material == Material.LAVA && i < 8 && i1 < 8 && i1 > i && random.nextInt(4) != 0) { // PaperSpigot
j *= 4;
}
@@ -82,7 +82,7 @@ public class BlockFlowing extends BlockFluids {
this.f(world, blockposition, iblockdata);
} else {
i = i1;
- if (i1 < 0) {
+ if (i1 < 0 || canFastDrain(world, blockposition)) { // PaperSpigot - Fast draining
world.setAir(blockposition);
} else {
iblockdata = iblockdata.set(BlockFlowing.LEVEL, Integer.valueOf(i1));
@@ -285,4 +285,52 @@ public class BlockFlowing extends BlockFluids {
}
return super.a(world);
}
+
+ /**
+ * PaperSpigot - Data check method for fast draining
+ */
+ public int getData(World world, BlockPosition position) {
+ int data = this.e(world, position);
+ return data < 8 ? data : 0;
+ }
+
+ /**
+ * PaperSpigot - Checks surrounding blocks to determine if block can be fast drained
+ */
+ public boolean canFastDrain(World world, BlockPosition position) {
+ boolean result = false;
2015-07-03 21:38:43 +02:00
+ int data = getData(world, position);
2015-07-01 05:22:24 +02:00
+ if (this.material == Material.WATER) {
+ if (world.paperSpigotConfig.fastDrainWater) {
+ result = true;
+ if (getData(world, position.down()) < 0) {
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.north()).getBlock().getMaterial() == Material.WATER && getData(world, position.north()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.south()).getBlock().getMaterial() == Material.WATER && getData(world, position.south()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.west()).getBlock().getMaterial() == Material.WATER && getData(world, position.west()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.east()).getBlock().getMaterial() == Material.WATER && getData(world, position.east()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
+ }
+ }
+ } else if (this.material == Material.LAVA) {
+ if (world.paperSpigotConfig.fastDrainLava) {
+ result = true;
2015-07-03 21:38:43 +02:00
+ if (getData(world, position.down()) < 0 || world.getType(position.up()).getBlock().getMaterial() != Material.AIR) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.north()).getBlock().getMaterial() == Material.LAVA && getData(world, position.north()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.south()).getBlock().getMaterial() == Material.LAVA && getData(world, position.south()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.west()).getBlock().getMaterial() == Material.LAVA && getData(world, position.west()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
2015-07-03 21:38:43 +02:00
+ } else if (world.getType(position.east()).getBlock().getMaterial() == Material.LAVA && getData(world, position.east()) < data) {
2015-07-01 05:22:24 +02:00
+ result = false;
+ }
+ }
+ }
+ return result;
+ }
}
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
index f3228d9..2ecacd5 100644
2015-07-01 05:22:24 +02:00
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
@@ -344,4 +344,12 @@ public class PaperSpigotWorldConfig
{
optimizeExplosions = getBoolean( "optimize-explosions", false );
}
+
+ public boolean fastDrainLava;
+ public boolean fastDrainWater;
+ private void fastDraining()
+ {
+ fastDrainLava = getBoolean( "fast-drain.lava", false );
+ fastDrainWater = getBoolean( "fast-drain.water", false );
+ }
}
--
2015-10-03 05:58:02 +02:00
2.6.0
2015-07-01 05:22:24 +02:00