2017-04-29 12:27:31 +02:00
From 58e7452d99c66366f890d624f3ee8315fe87eb8c Mon Sep 17 00:00:00 2001
2016-03-29 04:04:43 +02:00
From: Aikar <aikar@aikar.co>
Date: Mon, 28 Mar 2016 22:03:09 -0400
Subject: [PATCH] Prevent Waterflow BlockFromToEvent from loading chunks
Many protection plugins would unintentionally trigger chunk loads
by calling .getToBlock() on an unloaded chunk, killing performance.
Simply skip the event call. as CraftBukkit blocks changing the block
of unloaded chunks anyways.
This keeps behavior consistent, vs inconsistent flowing based on plugin triggered loads.
diff --git a/src/main/java/net/minecraft/server/BlockFlowing.java b/src/main/java/net/minecraft/server/BlockFlowing.java
2017-03-25 06:22:02 +01:00
index 0a2823686..8eba70b01 100644
2016-03-29 04:04:43 +02:00
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
2016-12-10 01:07:35 +01:00
@@ -96,6 +96,7 @@ public class BlockFlowing extends BlockFluids {
2016-03-29 04:04:43 +02:00
if (this.h(world, blockposition.down(), iblockdata2)) {
2016-12-10 01:07:35 +01:00
// CraftBukkit start
2016-03-29 04:04:43 +02:00
+ if (!canFlowTo(world, source, BlockFace.DOWN)) { return; } // Paper
BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
2016-12-10 01:07:35 +01:00
world.getServer().getPluginManager().callEvent(event);
2016-11-17 03:23:38 +01:00
@@ -136,6 +137,7 @@ public class BlockFlowing extends BlockFluids {
2016-03-29 04:04:43 +02:00
EnumDirection enumdirection1 = (EnumDirection) iterator1.next();
// CraftBukkit start
+ if (!canFlowTo(world, source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1))) { continue; } // Paper
BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection1));
2016-12-10 01:07:35 +01:00
world.getServer().getPluginManager().callEvent(event);
@@ -148,8 +150,14 @@ public class BlockFlowing extends BlockFluids {
2016-03-29 04:04:43 +02:00
}
+ // Paper start
+ private boolean canFlowTo(World world, org.bukkit.block.Block source, BlockFace face) {
+ return source.getWorld().isChunkLoaded((source.getX() + face.getModX()) >> 4, (source.getZ() + face.getModZ()) >> 4);
+ }
+ // Paper end
+
private void flow(World world, BlockPosition blockposition, IBlockData iblockdata, int i) {
- if (world.isLoaded(blockposition) && this.h(world, blockposition, iblockdata)) { // CraftBukkit - add isLoaded check
+ if (/*world.isLoaded(blockposition) &&*/ this.h(world, blockposition, iblockdata)) { // CraftBukkit - add isLoaded check // Paper - Already checked before we get here for isLoaded
2016-06-09 05:57:14 +02:00
if (iblockdata.getMaterial() != Material.AIR) {
2016-03-29 04:04:43 +02:00
if (this.material == Material.LAVA) {
this.fizz(world, blockposition);
--
2017-04-29 12:27:31 +02:00
2.12.2.windows.2
2016-03-29 04:04:43 +02:00