From bfbd24c5be0c4ef674e9994cd00561f75421405b Mon Sep 17 00:00:00 2001
From: Hugo Manrique <hugmanrique@gmail.com>
Date: Mon, 23 Jul 2018 16:57:21 +0200
Subject: [PATCH] Fix decompile error

---
 Spigot-Server-Patches/0003-MC-Dev-fixes.patch | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
index 594c48a31..79dd00d22 100644
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@@ -1,11 +1,11 @@
-From 1b41bf7f810b3bd6c90db0a7c4ee15776bc6f832 Mon Sep 17 00:00:00 2001
+From 82c31de99612ea9b07979ed524e3a007390842de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index e8f7b7292..a0ebc1eaa 100644
+index e8f7b729..a0ebc1ea 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -234,4 +234,5 @@ public class PaperCommand extends Command {
@@ -15,7 +15,7 @@ index e8f7b7292..a0ebc1eaa 100644
 +    
  }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a19..121a137f3 100644
+index 002da2a1..121a137f 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -150,7 +150,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -57,7 +57,7 @@ index 002da2a19..121a137f3 100644
                          }
  
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index 65910508f..15c7cc170 100644
+index a661789c..785a1a21 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -88,7 +88,7 @@ public class DefinedStructure {
@@ -111,6 +111,19 @@ index 65910508f..15c7cc170 100644
          }
  
          public Iterator<IBlockData> iterator() {
+diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
+index 4b5463cc..53c9f218 100644
+--- a/src/main/java/net/minecraft/server/VoxelShape.java
++++ b/src/main/java/net/minecraft/server/VoxelShape.java
+@@ -67,7 +67,7 @@ public abstract class VoxelShape {
+         ArrayList arraylist = Lists.newArrayList();
+ 
+         this.b((d0, d1, d2, d3, d4, d5) -> {
+-            list.add(new AxisAlignedBB(d0, d1, d2, d3, d4, d5));
++            arraylist.add(new AxisAlignedBB(d0, d1, d2, d3, d4, d5)); // Paper - decompile fix
+         });
+         return arraylist;
+     }
 -- 
-2.17.1
+2.18.0.windows.1