CatMC-Network/PaperSpigot-Parent
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fast draining

Browse Source
This commit is contained in:
Byteflux 2015-06-30 20:22:24 -07:00
parent 7ef5da4a4d
commit 41064e2faa
1 changed files with 101 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
Spigot-Server-Patches/0058-Fast-draining.patch Normal file
View File

@ -0,0 +1,101 @@
From 0e96ada80bf03572e4594a538dc20771c7cb0349 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Tue, 30 Jun 2015 19:53:03 -0700
Subject: [PATCH] Fast draining
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
index ab2e43f..33ff734 100644
--- 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;
+ if (this.material == Material.WATER) {
+ if (world.paperSpigotConfig.fastDrainWater) {
+ result = true;
+ if (getData(world, position.down()) < 0) {
+ result = false;
+ } else if (world.getType(position.north()).getBlock().getMaterial() == Material.WATER && getData(world, position.north()) < 1) {
+ result = false;
+ } else if (world.getType(position.south()).getBlock().getMaterial() == Material.WATER && getData(world, position.south()) < 1) {
+ result = false;
+ } else if (world.getType(position.west()).getBlock().getMaterial() == Material.WATER && getData(world, position.west()) < 1) {
+ result = false;
+ } else if (world.getType(position.east()).getBlock().getMaterial() == Material.WATER && getData(world, position.east()) < 1) {
+ result = false;
+ }
+ }
+ } else if (this.material == Material.LAVA) {
+ if (world.paperSpigotConfig.fastDrainLava) {
+ Material m;
+ result = true;
+ if (getData(world, position.down()) < 0) {
+ result = false;
+ } else if ((m = world.getType(position.north()).getBlock().getMaterial()) == Material.WATER || (m == Material.LAVA && getData(world, position.north()) < 1)) {
+ result = false;
+ } else if ((m = world.getType(position.south()).getBlock().getMaterial()) == Material.WATER || (m == Material.LAVA && getData(world, position.south()) < 1)) {
+ result = false;
+ } else if ((m = world.getType(position.west()).getBlock().getMaterial()) == Material.WATER || (m == Material.LAVA && getData(world, position.west()) < 1)) {
+ result = false;
+ } else if ((m = world.getType(position.east()).getBlock().getMaterial()) == Material.WATER || (m == Material.LAVA && getData(world, position.east()) < 1)) {
+ 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 4596e9d..4c6bfb9 100644
--- 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 );
+ }
}
--
1.9.5.msysgit.1