Merge branch 'master' of https://github.com/PaperMC/Paper

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,14 +1,14 @@
-From c59a5c4c7d44ac1e718fb648531bdba8132dbe23 Mon Sep 17 00:00:00 2001
+From 02fcecb03766871ce3f66f2f1e578ba7ae1f5acf Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 19dc1e6a8..69307e252 100644
+index 9f12a192..b4df9b77 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -580,4 +580,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -593,4 +593,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
      @Override
      Spigot spigot();
      // Spigot end
@@ -26,7 +26,7 @@ index 19dc1e6a8..69307e252 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/entity/FallingBlock.java b/src/main/java/org/bukkit/entity/FallingBlock.java
-index 64f9d3fd8..14cb0d770 100644
+index 64f9d3fd..14cb0d77 100644
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -54,4 +54,15 @@ public interface FallingBlock extends Entity {
@@ -46,7 +46,7 @@ index 64f9d3fd8..14cb0d770 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/entity/TNTPrimed.java b/src/main/java/org/bukkit/entity/TNTPrimed.java
-index 5a8789324..3022b4a27 100644
+index 5a878932..3022b4a2 100644
 --- a/src/main/java/org/bukkit/entity/TNTPrimed.java
 +++ b/src/main/java/org/bukkit/entity/TNTPrimed.java
 @@ -39,4 +39,15 @@ public interface TNTPrimed extends Explosive {
@@ -66,5 +66,5 @@ index 5a8789324..3022b4a27 100644
 +    }
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0059-Entity-fromMobSpawner.patch

@@ -1,14 +1,14 @@
-From c98cd92d19f14a732e1ac7e3e3922047e4dbf817 Mon Sep 17 00:00:00 2001
+From 16e989192ebb0f5c2bd23b5320a06e5d4b89b2c9 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <[email protected]>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 69307e252..373204d37 100644
+index b4df9b77..6dd0623b 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -591,5 +591,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -604,5 +604,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      @Nullable
      Location getOrigin();
@@ -22,5 +22,5 @@ index 69307e252..373204d37 100644
      // Paper end
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0119-Entity-getChunk-API.patch

@@ -1,12 +1,12 @@
-From dc0c46f1dc30775f7790fca15bfcf4ec99f40fc2 Mon Sep 17 00:00:00 2001
+From 4acfaf40b3ba2d5169242b996deecbffb9edee2a Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
 
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 373204d37..a7f81d17d 100644
+index 6dd0623b..81d92145 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -1,5 +1,7 @@
@@ -17,7 +17,7 @@ index 373204d37..a7f81d17d 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -598,5 +600,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -611,5 +613,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
@@ -32,5 +32,5 @@ index 373204d37..a7f81d17d 100644
      // Paper end
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0134-Async-Chunks-API.patch

@@ -1,4 +1,4 @@
-From e0bd691e726a2082f30e462d6afb9e3004c1bc56 Mon Sep 17 00:00:00 2001
+From 00cc998256d1b72114373e332cb0285b45d923e2 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API
@@ -8,7 +8,7 @@ Adds API's to load or generate chunks asynchronously.
 Also adds utility methods to Entity to teleport asynchronously.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c5da4d387..1b0744ed9 100644
+index c5da4d38..1b0744ed 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -163,6 +163,358 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -371,10 +371,10 @@ index c5da4d387..1b0744ed9 100644
 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index a7f81d17d..73b75ffda 100644
+index 81d92145..373ee223 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -145,6 +145,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -158,6 +158,30 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      public boolean teleport(@NotNull Entity destination, @NotNull TeleportCause cause);
 
@@ -406,5 +406,5 @@ index a7f81d17d..73b75ffda 100644
       * Returns a list of entities within a bounding box centered around this
       * entity
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-API-Patches/0175-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 66901f19f7ae0d30e59cbd768611e943d004ce98 Mon Sep 17 00:00:00 2001
+From 5a7684030d14e701044b8f93cb64f1103b297b19 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 73b75ffd..16151864 100644
+index 373ee223..148c7b1f 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -632,5 +632,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
+@@ -645,5 +645,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable {
       */
      @NotNull
      Chunk getChunk();
@@ -26,5 +26,5 @@ index 73b75ffd..16151864 100644
      // Paper end
  }
 -- 
-2.17.1
+2.17.2 (Apple Git-113)
 

Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch

@@ -1,4 +1,4 @@
-From 2fae759524a8a56cb30d347edcaa0e1c77d52aac Mon Sep 17 00:00:00 2001
+From 42f595bfdef623699698ed2eff096d8203f6d96c Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 417c015e56..b728a44f5f 100644
+index 417c015e5..b728a44f5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -36,7 +36,7 @@ public class Chunk implements IChunkAccess {
@@ -94,7 +94,7 @@ index 417c015e56..b728a44f5f 100644
                  // Do not pass along players, as doing so can get them stuck outside of time.
                  // (which for example disables inventory icon updates and prevents block breaking)
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c87d11da5b..faf4d0c0db 100644
+index d9c9748ce..3b8d09953 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -132,7 +132,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -147,7 +147,7 @@ index c87d11da5b..faf4d0c0db 100644
      private String entityKeyString;
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 7390061bf0..c69209497b 100644
+index 7390061bf..c69209497 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -41,6 +41,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -167,7 +167,7 @@ index 7390061bf0..c69209497b 100644
 
      @Nullable
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a3435c11ed..8fb0ecf525 100644
+index 9cdd0331f..7edbbb106 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -9,6 +9,7 @@ import java.util.UUID;
@@ -178,7 +178,7 @@ index a3435c11ed..8fb0ecf525 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Server;
-@@ -43,6 +44,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -44,6 +45,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          this.entity = entity;
      }
 
@@ -192,5 +192,5 @@ index a3435c11ed..8fb0ecf525 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.20.1
+2.17.2 (Apple Git-113)
 

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From b2b00bd52cd8c46f44492517c2455e3e5ea22e43 Mon Sep 17 00:00:00 2001
+From 6c0e6946f9c2eb2666098e885e4d04797719be35 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -1567,10 +1567,10 @@ index 413dd35f0..52a8c48fa 100644
 
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6a9957325..5b89da26c 100644
+index 7f0465ec4..99f99148d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1700,6 +1700,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1811,5 +1811,5 @@ index c1071c92e..a99c0cea0 100644
      }
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)
 

Spigot-Server-Patches/0018-Player-affects-spawning-API.patch

@@ -1,11 +1,11 @@
-From 448e99a666ff2e2d3ff53a03bd499bfeffc8b5bd Mon Sep 17 00:00:00 2001
+From 23d4a9f9dd6a7cc5e32ca7cb9d1ed9b3df431dc4 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 5a90376fe..8b826c083 100644
+index 050f21efa..58e037e13 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -68,6 +68,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -58,7 +58,7 @@ index 6ca0e19cb..4eaa5d93b 100644
 
                      j = MathHelper.floor(entityhuman.locZ / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 51df93b18..10c8ece94 100644
+index f24ee385c..106ad00dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -30,6 +30,7 @@ import org.bukkit.craftbukkit.CraftWorld;
@@ -79,10 +79,10 @@ index 51df93b18..10c8ece94 100644
 
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ca3393ef8..6f832b331 100644
+index 99f99148d..15c2e1dee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1608,7 +1608,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1613,7 +1613,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -103,5 +103,5 @@ index ca3393ef8..6f832b331 100644
      @Override
      public void updateCommands() {
 -- 
-2.20.1
+2.17.2 (Apple Git-113)
 

Spigot-Server-Patches/0022-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From 12aca1822c8ab8b773da6665131e058b40aa01ce Mon Sep 17 00:00:00 2001
+From a97fc09038865b90b5de975e178b84334717a349 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fb24f6019f..96de3b7735 100644
+index 15c2e1dee..0ee063bcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1297,12 +1297,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1302,12 +1302,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
 
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index fb24f6019f..96de3b7735 100644
 
      @Override
 -- 
-2.20.1
+2.17.2 (Apple Git-113)
 

Spigot-Server-Patches/0023-Entity-Origin-API.patch

@@ -1,11 +1,11 @@
-From fdc2c170dee0be99fab8d71daf0777a1ced71a5f Mon Sep 17 00:00:00 2001
+From 2b38a9778ec128f4bd4d817ec8b1e3d63c63b9ac Mon Sep 17 00:00:00 2001
 From: Byteflux <[email protected]>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 2b4a784e4..22f757756 100644
+index 6150eb1fc..bff44d535 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -160,6 +160,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -101,7 +101,7 @@ index 27debcfca..22027321b 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 73014cd35..da29880db 100644
+index 106ad00dc..470f40622 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -918,6 +918,12 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -118,10 +118,10 @@ index 73014cd35..da29880db 100644
              flag = true;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8fb0ecf52..9a5bb0222 100644
+index 7edbbb106..660e59ba1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -800,4 +800,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -816,4 +816,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -135,5 +135,5 @@ index 8fb0ecf52..9a5bb0222 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.17.2 (Apple Git-113)