Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>
2018-07-15 10:00:00 +10:00
parent d1e91a8adb
commit 7e0a66fdd5
608 changed files with 17788 additions and 9378 deletions
--- a/paper-server/nms-patches/FluidTypeFlowing.patch
+++ b/paper-server/nms-patches/FluidTypeFlowing.patch
@@ -0,0 +1,46 @@
+--- a/net/minecraft/server/FluidTypeFlowing.java
+++ b/net/minecraft/server/FluidTypeFlowing.java
+@@ -5,6 +5,11 @@
+ import java.util.Iterator;
+ import java.util.Map;
+ import java.util.Map.Entry;
+// CraftBukkit start
+import org.bukkit.block.BlockFace;
+import org.bukkit.craftbukkit.block.CraftBlock;
+import org.bukkit.event.block.BlockFromToEvent;
+// CraftBukkit end
+ 
+ public abstract class FluidTypeFlowing extends FluidType {
+ 
+@@ -116,6 +121,15 @@
+             Fluid fluid1 = this.a((IWorldReader) generatoraccess, blockposition1, iblockdata1);
+ 
+             if (this.a(generatoraccess, blockposition, iblockdata, EnumDirection.DOWN, blockposition1, iblockdata1, generatoraccess.b(blockposition1), fluid1.c())) {
+                // CraftBukkit start
+                org.bukkit.block.Block source = CraftBlock.at(generatoraccess, blockposition);
+                BlockFromToEvent event = new BlockFromToEvent(source, BlockFace.DOWN);
+                generatoraccess.getMinecraftWorld().getServer().getPluginManager().callEvent(event);
+
+                if (event.isCancelled()) {
+                    return;
+                }
+                // CraftBukkit end
+                 this.a(generatoraccess, blockposition1, iblockdata1, EnumDirection.DOWN, fluid1);
+                 if (this.a((IWorldReader) generatoraccess, blockposition) >= 3) {
+                     this.a(generatoraccess, blockposition, fluid, iblockdata);
+@@ -146,6 +160,15 @@
+                 IBlockData iblockdata1 = generatoraccess.getType(blockposition1);
+ 
+                 if (this.a(generatoraccess, blockposition, iblockdata, enumdirection, blockposition1, iblockdata1, generatoraccess.b(blockposition1), fluid1.c())) {
+                    // CraftBukkit start
+                    org.bukkit.block.Block source = CraftBlock.at(generatoraccess, blockposition);
+                    BlockFromToEvent event = new BlockFromToEvent(source, org.bukkit.craftbukkit.block.CraftBlock.notchToBlockFace(enumdirection));
+                    generatoraccess.getMinecraftWorld().getServer().getPluginManager().callEvent(event);
+
+                    if (event.isCancelled()) {
+                        continue;
+                    }
+                    // CraftBukkit end
+                     this.a(generatoraccess, blockposition1, iblockdata1, enumdirection, fluid1);
+                 }
+             }