Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>

paper-server/nms-patches/ItemBoat.patch

@@ -1,9 +1,9 @@
 --- a/net/minecraft/server/ItemBoat.java
 +++ b/net/minecraft/server/ItemBoat.java
-@@ -56,6 +56,13 @@
-             } else if (movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.BLOCK) {
+@@ -52,6 +52,13 @@
+             if (flag) {
                  return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
-             } else {
+             } else if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK) {
 +                // CraftBukkit start - Boat placement
 +                org.bukkit.event.player.PlayerInteractEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callPlayerInteractEvent(entityhuman, org.bukkit.event.block.Action.RIGHT_CLICK_BLOCK, movingobjectposition.a(), movingobjectposition.direction, itemstack, enumhand);
 +
@@ -11,10 +11,10 @@
 +                    return new InteractionResultWrapper(EnumInteractionResult.PASS, itemstack);
 +                }
 +                // CraftBukkit end
-                 Block block = world.getType(movingobjectposition.a()).getBlock();
-                 boolean flag1 = block == Blocks.WATER || block == Blocks.FLOWING_WATER;
-                 EntityBoat entityboat = new EntityBoat(world, movingobjectposition.pos.x, flag1 ? movingobjectposition.pos.y - 0.12D : movingobjectposition.pos.y, movingobjectposition.pos.z);
-@@ -66,7 +73,7 @@
+                 BlockPosition blockposition = movingobjectposition.a();
+                 Block block = world.getType(blockposition).getBlock();
+                 EntityBoat entityboat = new EntityBoat(world, movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
+@@ -62,7 +69,7 @@
                      return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
                  } else {
                      if (!world.isClientSide) {