8022d678b3
Thanks to Byteflux for all the PRs you see below bringing 1.8 PaperSpigot that much closer to feature parity with it's 1.7 branch
48 lines
2.2 KiB
Diff
48 lines
2.2 KiB
Diff
From 2ddb6a4a68cca73f8fcf579b42a381a1156b248f Mon Sep 17 00:00:00 2001
|
|
From: Byteflux <byte@byteflux.net>
|
|
Date: Fri, 10 Apr 2015 02:24:20 -0700
|
|
Subject: [PATCH] Optimize draining
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
index de1dddb..d8de1fc 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
|
|
@@ -88,7 +88,18 @@ public class BlockFlowing extends BlockFluids {
|
|
iblockdata = iblockdata.set(BlockFlowing.LEVEL, Integer.valueOf(i1));
|
|
world.setTypeAndData(blockposition, iblockdata, 2);
|
|
world.a(blockposition, (Block) this, j);
|
|
- world.applyPhysics(blockposition, this);
|
|
+ // PaperSpigot start - Optimize draining
|
|
+ if (world.paperSpigotConfig.optimizeDraining) {
|
|
+ world.d(blockposition.west(), this);
|
|
+ world.d(blockposition.east(), this);
|
|
+ world.d(blockposition.up(), this);
|
|
+ world.d(blockposition.north(), this);
|
|
+ world.d(blockposition.south(), this);
|
|
+ world.spigotConfig.antiXrayInstance.updateNearbyBlocks(world, blockposition); // Spigot
|
|
+ } else {
|
|
+ world.applyPhysics(blockposition, this);
|
|
+ }
|
|
+ // PaperSpigot end
|
|
}
|
|
}
|
|
} else {
|
|
diff --git a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
index dc8bebd..1ca8b0d 100644
|
|
--- a/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
+++ b/src/main/java/org/github/paperspigot/PaperSpigotWorldConfig.java
|
|
@@ -240,4 +240,10 @@ public class PaperSpigotWorldConfig
|
|
useAsyncLighting = getBoolean( "use-async-lighting", false );
|
|
log( "World async lighting: " + useAsyncLighting );
|
|
}
|
|
+
|
|
+ public boolean optimizeDraining;
|
|
+ private void optimizeDraining()
|
|
+ {
|
|
+ optimizeDraining = getBoolean( "optimize-draining", false );
|
|
+ }
|
|
}
|
|
--
|
|
2.3.5
|
|
|