SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update upstream B/CB

Browse Source
This commit is contained in:
Zach Brown
2016-12-09 18:07:35 -06:00
parent cead4e0a74
commit b21c31c91d
14 changed files with 59 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Spigot-Server-Patches/Prevent-Waterflow-BlockFromToEvent-from-loading-chun.patch
View File

@@ -12,25 +12,25 @@ 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
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
index 765a37160..6939ac2cc 100644
--- a/src/main/java/net/minecraft/server/BlockFlowing.java
+++ b/src/main/java/net/minecraft/server/BlockFlowing.java
@@ -0,0 +0,0 @@ public class BlockFlowing extends BlockFluids {
IBlockData iblockdata2 = world.getType(blockposition.down());
if (this.h(world, blockposition.down(), iblockdata2)) {
// CraftBukkit start
+ if (!canFlowTo(world, source, BlockFace.DOWN)) { return; } // Paper
// CraftBukkit start - Send "down" to the server
BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
if (server != null) {
world.getServer().getPluginManager().callEvent(event);
@@ -0,0 +0,0 @@ public class BlockFlowing extends BlockFluids {
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));
if (server != null) {
server.getPluginManager().callEvent(event);
world.getServer().getPluginManager().callEvent(event);
@@ -0,0 +0,0 @@ public class BlockFlowing extends BlockFluids {
}