Fix vanished players don't have rights patch

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

@@ -1,4 +1,4 @@
-From e723c0ee1bfff0b62d6996d7f9dbcf608abcf629 Mon Sep 17 00:00:00 2001
+From 6b6191a14bd3c49c0b53c276a8d47f635fa66d75 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
@@ -17,60 +17,117 @@ index 291a8029ed..fe9881fdf2 100644
      public final List<Entity> passengers;
      protected int j;
      private Entity vehicle;
-diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb0387..e5a013ffd2 100644
---- a/src/main/java/net/minecraft/server/IEntityAccess.java
-+++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -22,9 +22,18 @@ public interface IEntityAccess {
-         return this.getEntities(entity, axisalignedbb, IEntitySelector.f);
+diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
+index 0f4aa698aa..1f78993375 100644
+--- a/src/main/java/net/minecraft/server/IBlockData.java
++++ b/src/main/java/net/minecraft/server/IBlockData.java
+@@ -142,6 +142,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+         return this.b(iblockaccess, blockposition, VoxelShapeCollision.a());
      }
 
-+    // Paper start
-     default boolean a(@Nullable Entity entity, VoxelShape voxelshape) {
-+        return this.checkEntityCollision(entity, voxelshape, false);
-+    }
-+    default boolean checkEntityCollision(Entity entity, VoxelShape voxelshape, boolean checkCanSee) {
-         return voxelshape.isEmpty() ? true : this.getEntities(entity, voxelshape.getBoundingBox()).stream().filter((entity1) -> {
-+            if (entity instanceof EntityPlayer && entity1 instanceof EntityPlayer
-+                && !((EntityPlayer)entity).getBukkitEntity().canSee(((EntityPlayer)entity1).getBukkitEntity())) {
-+                return false;
-+            }
-             return !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
-+            // Paper end
-         }).noneMatch((entity1) -> {
-             return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
-         });
-diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 7308c0c319..ed3f793f20 100644
---- a/src/main/java/net/minecraft/server/IWorldReader.java
-+++ b/src/main/java/net/minecraft/server/IWorldReader.java
-@@ -84,7 +84,12 @@ public interface IWorldReader extends IIBlockAccess {
-         return ChunkStatus.EMPTY;
++    public final VoxelShape getCollisionShape(IBlockAccess iblockaccess, BlockPosition blockposition, VoxelShapeCollision voxelshapecollision) { return this.b(iblockaccess, blockposition, voxelshapecollision); } // Paper - OBFHELPER
+     public VoxelShape b(IBlockAccess iblockaccess, BlockPosition blockposition, VoxelShapeCollision voxelshapecollision) {
+         return this.getBlock().b(this, iblockaccess, blockposition, voxelshapecollision);
      }
-
-+    // Paper start
-     default boolean a(IBlockData iblockdata, BlockPosition blockposition, VoxelShapeCollision voxelshapecollision) {
-+        return this.checkEntityCollision(iblockdata, blockposition, voxelshapecollision, false);
-+    }
-+    default boolean checkEntityCollision(IBlockData iblockdata, BlockPosition blockposition, VoxelShapeCollision voxelshapecollision, boolean checkCanSee) {
-+        // Paper end
-         VoxelShape voxelshape = iblockdata.b((IBlockAccess) this, blockposition, voxelshapecollision);
-
-         return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2e..b90cc6652b 100644
+index 59b1e6ce2e..9f29e714b8 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -126,7 +126,8 @@ public class ItemBlock extends Item {
          EntityHuman entityhuman = blockactioncontext.getEntity();
          VoxelShapeCollision voxelshapecollision = entityhuman == null ? VoxelShapeCollision.a() : VoxelShapeCollision.a((Entity) entityhuman);
          // CraftBukkit start - store default return
 -        boolean defaultReturn = (!this.d() || iblockdata.canPlace(blockactioncontext.getWorld(), blockactioncontext.getClickPosition())) && blockactioncontext.getWorld().a(iblockdata, blockactioncontext.getClickPosition(), voxelshapecollision);
-+        final World world = blockactioncontext.getWorld(); // Paper
-+        boolean defaultReturn = (!this.d() || iblockdata.canPlace(world, blockactioncontext.getClickPosition())) && world.checkEntityCollision(iblockdata, blockactioncontext.getClickPosition(), voxelshapecollision, true); // Paper
++        World world = blockactioncontext.getWorld(); // Paper
++        boolean defaultReturn = (!this.d() || iblockdata.canPlace(world, blockactioncontext.getClickPosition())) && world.checkEntityCollision(iblockdata, entityhuman, voxelshapecollision, blockactioncontext.getClickPosition(), true); // Paper
          org.bukkit.entity.Player player = (blockactioncontext.getEntity() instanceof EntityPlayer) ? (org.bukkit.entity.Player) blockactioncontext.getEntity().getBukkitEntity() : null;
 
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
+diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
+index 6bfbc3616e..7bed2d208f 100644
+--- a/src/main/java/net/minecraft/server/VoxelShape.java
++++ b/src/main/java/net/minecraft/server/VoxelShape.java
+@@ -46,6 +46,7 @@ public abstract class VoxelShape {
+         return this.a.a();
+     }
+
++    public final VoxelShape offset(double x, double y, double z) { return this.a(x, y, z); } // Paper - OBFHELPER
+     public VoxelShape a(double d0, double d1, double d2) {
+         return (VoxelShape) (this.isEmpty() ? VoxelShapes.a() : new VoxelShapeArray(this.a, new DoubleListOffset(this.a(EnumDirection.EnumAxis.X), d0), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Y), d1), new DoubleListOffset(this.a(EnumDirection.EnumAxis.Z), d2)));
+     }
+diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
+index 811841d110..5c393f11d7 100644
+--- a/src/main/java/net/minecraft/server/VoxelShapes.java
++++ b/src/main/java/net/minecraft/server/VoxelShapes.java
+@@ -33,6 +33,7 @@ public final class VoxelShapes {
+         return a(new AxisAlignedBB(d0, d1, d2, d3, d4, d5));
+     }
+
++    public static final VoxelShape of(AxisAlignedBB axisAlignedbb) { return VoxelShapes.a(axisAlignedbb); } // Paper - OBFHELPER
+     public static VoxelShape a(AxisAlignedBB axisalignedbb) {
+         int i = a(axisalignedbb.minX, axisalignedbb.maxX);
+         int j = a(axisalignedbb.minY, axisalignedbb.maxY);
+@@ -127,6 +128,7 @@ public final class VoxelShapes {
+         }
+     }
+
++    public static final boolean applyOperation(VoxelShape voxelshape, VoxelShape voxelshape1, OperatorBoolean operatorboolean) { return VoxelShapes.c(voxelshape, voxelshape1, operatorboolean); } // Paper - OBFHELPER
+     public static boolean c(VoxelShape voxelshape, VoxelShape voxelshape1, OperatorBoolean operatorboolean) {
+         if (operatorboolean.apply(false, false)) {
+             throw new IllegalArgumentException();
+diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
+index d205ec01ac..05c7a49a4a 100644
+--- a/src/main/java/net/minecraft/server/World.java
++++ b/src/main/java/net/minecraft/server/World.java
+@@ -164,6 +164,48 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+         this.tileLimiter = new org.spigotmc.TickLimiter(spigotConfig.tileMaxTickTime);
+     }
+
++    // Paper start
++    // ret true if no collision
++    public final boolean checkEntityCollision(IBlockData data, Entity source, VoxelShapeCollision voxelshapedcollision,
++                                        BlockPosition position, boolean checkCanSee) {
++        // Copied from IWorldReader#a(IBlockData, BlockPosition, VoxelShapeCollision) & EntityAccess#a(Entity, VoxelShape)
++        VoxelShape voxelshape = data.getCollisionShape(this, position, voxelshapedcollision);
++        if (voxelshape.isEmpty()) {
++            return true;
++        }
++
++        voxelshape = voxelshape.offset((double) position.getX(), (double) position.getY(), (double) position.getZ());
++
++        if (voxelshape.isEmpty()) {
++            return true;
++        }
++
++        List<Entity> entities = this.getEntities(null, voxelshape.getBoundingBox());
++
++        for (int i = 0, len = entities.size(); i < len; ++i) {
++            Entity entity = entities.get(i);
++
++            if (checkCanSee && source instanceof EntityPlayer && entity instanceof EntityPlayer
++                && !((EntityPlayer)source).getBukkitEntity().canSee(((EntityPlayer)entity).getBukkitEntity())) {
++                continue;
++            }
++
++            // !entity1.dead && entity1.i && (entity == null || !entity1.x(entity));
++            // elide the last check since vanilla calls with entity = null
++            // only we care about the source for the canSee check
++            if (entity.dead || !entity.blocksEntitySpawning()) {
++                continue;
++            }
++
++            if (VoxelShapes.applyOperation(voxelshape, VoxelShapes.of(entity.getBoundingBox()), OperatorBoolean.AND)) {
++                return false;
++            }
++        }
++
++        return true;
++    }
++    // Paper end
++
+     @Override
+     public BiomeBase getBiome(BlockPosition blockposition) {
+         IChunkProvider ichunkprovider = this.getChunkProvider();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 index 80b0fb8c11..dd25a8ad29 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -91,5 +148,5 @@ index 80b0fb8c11..dd25a8ad29 100644
          return event;
      }
 -- 
-2.22.0
+2.21.0
 

Spigot-Server-Patches/0321-Add-sun-related-API.patch

@@ -1,11 +1,11 @@
-From 0eb9bc27ad0eacecb69793530ca907e2e9129beb Mon Sep 17 00:00:00 2001
+From de658a99cc0c2fd95317f1a9c12f394aa3dec85f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index c2771c5d94..c81e530902 100644
+index c2771c5d9..c81e53090 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,10 +17,10 @@ index c2771c5d94..c81e530902 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d205ec01ac..ce7e019208 100644
+index 05c7a49a4..83e7a65a2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -663,6 +663,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -705,6 +705,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
          }
      }
 
@@ -29,7 +29,7 @@ index d205ec01ac..ce7e019208 100644
          return this.d < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d4bad21560..f4afddba4d 100644
+index 4b3ea756e..93ddf7eed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -739,6 +739,13 @@ public class CraftWorld implements World {
@@ -47,7 +47,7 @@ index d4bad21560..f4afddba4d 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 53c2d154ed..56c233872b 100644
+index 53c2d154e..56c233872 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -68,4 +68,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@@ -63,5 +63,5 @@ index 53c2d154ed..56c233872b 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From c70be437b775f3474b8eea301f826bdaa0e86c9c Mon Sep 17 00:00:00 2001
+From 57c32d7dae8f6be43ba79b6335dfaa929acf3cd2 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa38..ef882b897f 100644
+index ad793ffa3..ef882b897 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -439,4 +439,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..cf5661f1c5
+index 000000000..cf5661f1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 7ce9cdb853..6b5015ce5f 100644
+index 7ce9cdb85..6b5015ce5 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,18 +1124,18 @@ index 7ce9cdb853..6b5015ce5f 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ce7e019208..638b9887c0 100644
+index 83e7a65a2..e35188ef0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -552,6 +552,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -594,6 +594,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
 
      }
 
 +    public void neighborChanged(BlockPosition pos, Block blockIn, BlockPosition fromPos) { a(pos, blockIn, fromPos); } // Paper - OBFHELPER
      public void a(BlockPosition blockposition, Block block, BlockPosition blockposition1) {
          if (!this.isClientSide) {
              IBlockData iblockdata = this.getType(blockposition);
-@@ -1298,6 +1299,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1340,6 +1341,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
          return this.getBlockFacePower(blockposition.down(), EnumDirection.DOWN) > 0 ? true : (this.getBlockFacePower(blockposition.up(), EnumDirection.UP) > 0 ? true : (this.getBlockFacePower(blockposition.north(), EnumDirection.NORTH) > 0 ? true : (this.getBlockFacePower(blockposition.south(), EnumDirection.SOUTH) > 0 ? true : (this.getBlockFacePower(blockposition.west(), EnumDirection.WEST) > 0 ? true : this.getBlockFacePower(blockposition.east(), EnumDirection.EAST) > 0))));
      }
 
@@ -1144,5 +1144,5 @@ index ce7e019208..638b9887c0 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0358-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From 76af5c87dc330880cacfdb3aee255c1800f64bf6 Mon Sep 17 00:00:00 2001
+From 871e60c0c44878e7ad1137fdcb728bc784343ee6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,10 +11,10 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 638b9887c0..988f778f19 100644
+index e35188ef0..0f04860bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -482,8 +482,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -524,8 +524,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
              return false;
          } else {
              Fluid fluid = this.getFluid(blockposition);
@@ -37,5 +37,5 @@ index 638b9887c0..988f778f19 100644
                  TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null;
 
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From 3e3f6b8fee442d69ef39806f9bcadfa23b92dea3 Mon Sep 17 00:00:00 2001
+From e883942e00955e4a4caa2e8e8f80169d12beb3c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup
@@ -10,10 +10,10 @@ Optimize to check if the captured list even has values in it, and also to
 just do a get call since the value can never be null.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 988f778f19..469d967a43 100644
+index 0f04860bc..a9c5ded5b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1045,12 +1045,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
+@@ -1087,12 +1087,13 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
              return null;
          } else {
              // CraftBukkit start
@@ -31,5 +31,5 @@ index 988f778f19..469d967a43 100644
              if (this.tickingTileEntities) {
                  tileentity = this.B(blockposition);
 -- 
-2.21.0
+2.22.0