Merge pull request #1256

adbb709f Fix decompile error (Hugo Manrique)
f2fe0329 Re-add Vanished players don't have rights patch (Hugo Manrique)

* pull/1256/head:
  Fix decompile error
  Re-add Vanished players don't have rights patch

Spigot-Server-Patches/Add-MinecraftKey-Information-to-Objects.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index a0ebc1eaa..e4c771a39 100644
+index e8f7b7292d..7ff8e70b24 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -0,0 +0,0 @@ public class PaperCommand extends Command {
@@ -18,15 +18,8 @@ index a0ebc1eaa..e4c771a39 100644
  
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
-@@ -0,0 +0,0 @@ public class PaperCommand extends Command {
- 
-         Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
-     }
--    
-+
- }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3fa32228b..e65558f7a 100644
+index 29c7043c86..1a7d78a5c3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ import org.bukkit.event.entity.EntityPortalEvent;
@@ -88,7 +81,7 @@ index 3fa32228b..e65558f7a 100644
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 9a513b4e3..fa268f354 100644
+index 9a513b4e3a..fa268f3543 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -0,0 +0,0 @@ public class EntityTypes<T extends Entity> {
@@ -101,7 +94,7 @@ index 9a513b4e3..fa268f354 100644
      }
 diff --git a/src/main/java/net/minecraft/server/KeyedObject.java b/src/main/java/net/minecraft/server/KeyedObject.java
 new file mode 100644
-index 000000000..61c2b993c
+index 0000000000..61c2b993c9
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/KeyedObject.java
 @@ -0,0 +0,0 @@
@@ -114,7 +107,7 @@ index 000000000..61c2b993c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 8a0453245..257dd1da9 100644
+index 8a0453245d..257dd1da9c 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -0,0 +0,0 @@ import org.apache.logging.log4j.Logger;

Spigot-Server-Patches/Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -61,7 +61,7 @@ index aa75cc4205..56a74c6062 100644
          if (entity instanceof EntityItem) {
              itemCounts[i]--;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9f2a23d693..7a63114fe5 100644
+index e657778469..85358902ff 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/MC-Dev-fixes.patch

@@ -4,18 +4,8 @@ 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
---- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -0,0 +0,0 @@ public class PaperCommand extends Command {
- 
-         Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Paper config reload complete.");
-     }
-+    
- }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 002da2a19..9f3aa2459 100644
+index 002da2a191..9f3aa24590 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +0,0 @@ public class BlockPosition extends BaseBlockPosition {
@@ -69,7 +59,7 @@ index 002da2a19..9f3aa2459 100644
                          }
  
 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index a661789c1..785a1a218 100644
+index a661789c1e..785a1a2184 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
 @@ -0,0 +0,0 @@ public class DefinedStructure {
@@ -124,7 +114,7 @@ index a661789c1..785a1a218 100644
  
          public Iterator<IBlockData> iterator() {
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 3b8f6ec16..bde5714dd 100644
+index 3b8f6ec167..bde5714dd6 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -0,0 +0,0 @@ import java.util.Arrays;
@@ -164,4 +154,17 @@ index 3b8f6ec16..bde5714dd 100644
          this.e = 0;
          this.f = 0;
  
+diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
+index 4b5463cca2..53c9f21887 100644
+--- a/src/main/java/net/minecraft/server/VoxelShape.java
++++ b/src/main/java/net/minecraft/server/VoxelShape.java
+@@ -0,0 +0,0 @@ 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;
+     }
 --

Spigot-Server-Patches/Vanished-players-don-t-have-rights.patch

@@ -0,0 +1,127 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Hugo Manrique <hugmanrique@gmail.com>
+Date: Mon, 23 Jul 2018 14:22:26 +0200
+Subject: [PATCH] Vanished players don't have rights
+
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index 9f2a23d693..e657778469 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+     private static int entityCount;
+     private final EntityTypes<?> g; public EntityTypes<?> getEntityType() { return g; } // Paper - OBFHELPER
+     private int id;
+-    public boolean j;
++    public boolean j; public boolean blocksEntitySpawning() { return j; } // Paper - OBFHELPER
+     public final List<Entity> passengers;
+     protected int k;
+     private Entity ax;
+diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
+index c8f305e6d6..b57f6efb3a 100644
+--- a/src/main/java/net/minecraft/server/IBlockData.java
++++ b/src/main/java/net/minecraft/server/IBlockData.java
+@@ -0,0 +0,0 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {
+         return this.getBlock().a(this, iblockaccess, blockposition);
+     }
+ 
++    default VoxelShape getBlockShape(IBlockAccess iblockaccess, BlockPosition blockposition) { return h(iblockaccess, blockposition); } // Paper - OBFHELPER
+     default VoxelShape h(IBlockAccess iblockaccess, BlockPosition blockposition) {
+         return this.getBlock().f(this, iblockaccess, blockposition);
+     }
+diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
+index 1cecccef23..afc881d9af 100644
+--- a/src/main/java/net/minecraft/server/ItemBlock.java
++++ b/src/main/java/net/minecraft/server/ItemBlock.java
+@@ -0,0 +0,0 @@ public class ItemBlock extends Item {
+ 
+     protected boolean b(BlockActionContext blockactioncontext, IBlockData iblockdata) {
+         // CraftBukkit start - store default return
+-        boolean defaultReturn = iblockdata.canPlace(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()) && blockactioncontext.getWorld().a(iblockdata, blockactioncontext.getClickPosition());
++        final World world = blockactioncontext.getWorld(); // Paper
++        boolean defaultReturn = iblockdata.canPlace(world, blockactioncontext.getClickPosition()) && world.a(iblockdata, blockactioncontext.getClickPosition()) && world.checkNoVisiblePlayerCollisions(blockactioncontext.getEntity(), iblockdata.getBlockShape(world, blockactioncontext.getClickPosition())); // Paper - Use our entity search
+ 
+         BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), CraftBlockData.fromData(iblockdata), defaultReturn);
+         blockactioncontext.getWorld().getServer().getPluginManager().callEvent(event);
+diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
+index 53c9f21887..71e4084320 100644
+--- a/src/main/java/net/minecraft/server/VoxelShape.java
++++ b/src/main/java/net/minecraft/server/VoxelShape.java
+@@ -0,0 +0,0 @@ public abstract class VoxelShape {
+         return this.a(enumdirection_enumaxis, this.a.b(enumdirection_enumaxis));
+     }
+ 
++    public AxisAlignedBB getBounds() { return a(); } // Paper - OBFHELPER
+     public AxisAlignedBB a() {
+         if (this.b()) {
+             throw new UnsupportedOperationException("No bounds for empty shape.");
+@@ -0,0 +0,0 @@ public abstract class VoxelShape {
+ 
+     protected abstract DoubleList a(EnumDirection.EnumAxis enumdirection_enumaxis);
+ 
++    public boolean isEmpty() { return b(); } // Paper - OBFHELPER
+     public boolean b() {
+         return this.a.a();
+     }
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index 72e22c09ba..6d80e55c19 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -0,0 +0,0 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
+         }
+     }
+ 
++    // Paper start - Based on method below
++    /**
++     * @param entity causing the action ex. block placer
++     * @param voxelshape area to search within
++     * @return if there are no visible players colliding
++     */
++    public boolean checkNoVisiblePlayerCollisions(@Nullable Entity entity, VoxelShape voxelshape) {
++        if (voxelshape.isEmpty()) {
++            return true;
++        } else {
++            List list = this.getEntities((Entity) null, voxelshape.getBounds());
++
++            for (int i = 0; i < list.size(); ++i) {
++                Entity entity1 = (Entity) list.get(i);
++
++                if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer) {
++                    if (!((EntityPlayer) entity).getBukkitEntity().canSee(((EntityPlayer) entity1).getBukkitEntity())) {
++                        continue;
++                    }
++                }
++
++                if (!entity1.dead && entity1.blocksEntitySpawning()) {
++                    return false;
++                }
++            }
++
++            return true;
++        }
++    }
++    // Paper end
++
+     public boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
+         if (voxelshape.b()) {
+             return true;
+diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+index cf398cd250..140ddae0d7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -0,0 +0,0 @@ public class CraftEventFactory {
+         Projectile projectile = (Projectile) entity.getBukkitEntity();
+         org.bukkit.entity.Entity collided = position.entity.getBukkitEntity();
+         com.destroystokyo.paper.event.entity.ProjectileCollideEvent event = new com.destroystokyo.paper.event.entity.ProjectileCollideEvent(projectile, collided);
++
++        if (projectile.getShooter() instanceof Player && collided instanceof Player) {
++            if (!((Player) projectile.getShooter()).canSee((Player) collided)) {
++                event.setCancelled(true);
++                return event;
++            }
++        }
++
+         Bukkit.getPluginManager().callEvent(event);
+         return event;
+     }
+--