Re-add Vanished players don't have rights patch

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

@@ -0,0 +1,129 @@
+From 76185f16d4274c0d2f2ac47e49ba382a79ff99dd 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 b6d6d4f3..ce2fdbeb 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
++++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -92,7 +92,7 @@ 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 c8f305e6..b57f6efb 100644
+--- a/src/main/java/net/minecraft/server/IBlockData.java
++++ b/src/main/java/net/minecraft/server/IBlockData.java
+@@ -179,6 +179,7 @@ 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 1cecccef..afc881d9 100644
+--- a/src/main/java/net/minecraft/server/ItemBlock.java
++++ b/src/main/java/net/minecraft/server/ItemBlock.java
+@@ -70,7 +70,8 @@ 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 53c9f218..71e40843 100644
+--- a/src/main/java/net/minecraft/server/VoxelShape.java
++++ b/src/main/java/net/minecraft/server/VoxelShape.java
+@@ -22,6 +22,7 @@ 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.");
+@@ -40,6 +41,7 @@ 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 127dcedc..302a3655 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -1544,6 +1544,37 @@ 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 cf398cd2..140ddae0 100644
+--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
++++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+@@ -804,6 +804,14 @@ 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;
+     }
+-- 
+2.18.0.windows.1
+