Rebuild patches for upstream merge

Spigot-Server-Patches/Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -6,36 +6,28 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f6b755863..108654d63 100644
+index 0e0dc72f0..d725bf13e 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 ICommandListener, KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
-         }
+     protected CraftEntity bukkitEntity;
-         return bukkitEntity;
-     }
-+    Throwable addedToWorldStack; // Paper - entity debug
-     // CraftBukikt end
  
-     private static final Logger a = LogManager.getLogger();
+     EntityTrackerEntry tracker; // Paper
++    Throwable addedToWorldStack; // Paper - entity debug
+     public CraftEntity getBukkitEntity() {
+         if (bukkitEntity == null) {
+             bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b16324e1a..994d4bbb8 100644
+index fcb5f68f8..013f4eef5 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -0,0 +0,0 @@ import com.google.common.util.concurrent.ListenableFuture;
- import java.io.File;
- import java.util.ArrayList;
- import java.util.Collection;
-+import java.util.Date;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-     private final List<NextTickListEntry> W = Lists.newArrayList();
+     private boolean Q;
  
      // CraftBukkit start
 +    private static final boolean DEBUG_ENTITIES = Boolean.getBoolean("debug.entities"); // Paper
 +    private static Throwable getAddToWorldStackTrace(Entity entity) {
-+        return new Throwable(entity + " Added to world at " + new Date());
++        return new Throwable(entity + " Added to world at " + new java.util.Date());
 +    }
      public final int dimension;
  
@@ -43,16 +35,16 @@ index b16324e1a..994d4bbb8 100644
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
      private boolean j(Entity entity) {
          if (entity.dead) {
-             WorldServer.a.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.a(entity)); // CraftBukkit // Paper
+             WorldServer.a.warn("Tried to add entity {} but it was marked as removed already: " + entity); // CraftBukkit // Paper
 +            if (DEBUG_ENTITIES) getAddToWorldStackTrace(entity).printStackTrace();
              return false;
          } else {
              UUID uuid = entity.getUniqueID();
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-                     this.f.remove(entity1);
+                     this.g.remove(entity1);
                  } else {
                      if (!(entity instanceof EntityHuman)) {
--                        WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.a(entity1), uuid.toString()); // CraftBukkit // Paper
+-                        WorldServer.a.error("Keeping entity {} that already exists with UUID {} - " + entity1, EntityTypes.getName(entity1.P()), uuid.toString()); // CraftBukkit // Paper
 +                        WorldServer.a.error("Keeping entity {} that already exists with UUID {}", entity1, uuid.toString()); // CraftBukkit // Paper
                          WorldServer.a.error("Deleting duplicate entity {}", entity); // Paper
 +                        if (DEBUG_ENTITIES) {
@@ -73,6 +65,7 @@ index b16324e1a..994d4bbb8 100644
 +        if (DEBUG_ENTITIES) {
 +            entity.addedToWorldStack = getAddToWorldStackTrace(entity);
 +        }
++
 +        Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);
 +        if (old != null && old.getId() != entity.getId() && old.valid) {
 +            Logger logger = LogManager.getLogger();
@@ -87,7 +80,7 @@ index b16324e1a..994d4bbb8 100644
 +            }
 +        }
 +        // Paper end
-         Entity[] aentity = entity.bb();
+         Entity[] aentity = entity.bi();
  
          if (aentity != null) {
 --

Spigot-Server-Patches/Additional-Paper-Config-options.patch

@@ -21,7 +21,7 @@ index 62bce1806..5a17ce3d2 100644
          if (verbose) {
              Bukkit.getLogger().info(s);
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 50416f40a..14c8edeff 100644
+index 692206127..7bd7aa0d9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ import org.bukkit.configuration.file.YamlConfiguration;

Spigot-Server-Patches/Avoid-item-merge-if-stack-size-above-max-stack-size.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index d232bab745..b0f22f8f09 100644
+index d232bab74..b0f22f8f0 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -0,0 +0,0 @@ public class EntityItem extends Entity {

Spigot-Server-Patches/Cap-Entity-Collisions.patch

@@ -27,7 +27,7 @@ index 5df8b1143..0b748d402 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b47bf9738..db7e37aee 100644
+index 4bfc49076..8a04a801b 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/Don-t-allow-entities-to-ride-themselves-572.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index eb2a693af..b47bf9738 100644
+index c7ef67a52..4bfc49076 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/Don-t-let-fishinghooks-use-portals.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 51b42933d..eb2a693af 100644
+index 34c617958..c7ef67a52 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/Don-t-teleport-dead-entities.patch

@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c0367df20..c37c46e71 100644
+index 56aa89b45..f98f93c5c 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/Duplicate-UUID-Resolve-Option.patch

@@ -33,7 +33,7 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 14c8edeff..e3f6557e1 100644
+index 7bd7aa0d9..ba6d5b7ff 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -0,0 +0,0 @@ public class PaperWorldConfig {
@@ -78,7 +78,7 @@ index 14c8edeff..e3f6557e1 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 04adf4e3c..ea9559583 100644
+index 03afa1236..1f50004cb 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -0,0 +0,0 @@
@@ -90,17 +90,17 @@ index 04adf4e3c..ea9559583 100644
 +import java.util.UUID;
 +// Paper end
  import com.destroystokyo.paper.exception.ServerInternalException;
- import com.google.common.base.Predicate;
  import com.google.common.collect.Maps;
-@@ -0,0 +0,0 @@ public class Chunk {
+ import com.google.common.collect.Queues;
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
      public final World world;
-     public final int[] heightMap;
+     public final Map<HeightMap.Type, HeightMap> heightMap;
      public Long scheduledForUnload; // Paper - delay chunk unloads
 +    private static final Logger logger = LogManager.getLogger(); // Paper
      public final int locX;
      public final int locZ;
      private boolean m;
-@@ -0,0 +0,0 @@ public class Chunk {
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
          if (i != this.locX || j != this.locZ) {
              Chunk.e.warn("Wrong location! ({}, {}) should be ({}, {}), {}", Integer.valueOf(i), Integer.valueOf(j), Integer.valueOf(this.locX), Integer.valueOf(this.locZ), entity);
              entity.die();
@@ -108,7 +108,7 @@ index 04adf4e3c..ea9559583 100644
          }
  
          int k = MathHelper.floor(entity.locY / 16.0D);
-@@ -0,0 +0,0 @@ public class Chunk {
+@@ -0,0 +0,0 @@ public class Chunk implements IChunkAccess {
  
          for (int j = 0; j < i; ++j) {
              List entityslice = aentityslice[j]; // Spigot
@@ -147,32 +147,32 @@ index 04adf4e3c..ea9559583 100644
              this.world.a((Collection) entityslice);
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0d3af8cb7..7188d0c99 100644
+index d725bf13e..7154692ee 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 ICommandListener, KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          });
      }
  
 +    public void setUUID(UUID uuid) { a(uuid); } // Paper - OBFHELPER
      public void a(UUID uuid) {
          this.uniqueID = uuid;
-         this.ar = this.uniqueID.toString();
+         this.au = this.uniqueID.toString();
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 994d4bbb8..1244baf45 100644
+index 013f4eef5..b9d03d801 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+     private final MinecraftServer server;
+     public EntityTracker tracker;
      private final PlayerChunkMap manager;
-     // private final Set<NextTickListEntry> nextTickListHash = Sets.newHashSet();
-     private final HashTreeSet<NextTickListEntry> nextTickList = new HashTreeSet<NextTickListEntry>(); // CraftBukkit - HashTreeSet
 -    private final Map<UUID, Entity> entitiesByUUID = Maps.newHashMap();
 +    public final Map<UUID, Entity> entitiesByUUID = Maps.newHashMap(); // Paper
      public boolean savingDisabled;
-     private boolean Q;
+     private boolean K;
      private int emptyTime;
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-                     this.f.remove(entity1);
+                     this.g.remove(entity1);
                  } else {
                      if (!(entity instanceof EntityHuman)) {
 -                        WorldServer.a.error("Keeping entity {} that already exists with UUID {}", entity1, uuid.toString()); // CraftBukkit // Paper
@@ -196,8 +196,8 @@ index 994d4bbb8..1244baf45 100644
                      }
  
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-             entity.addedToWorldStack = getAddToWorldStackTrace(entity);
          }
+ 
          Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);
 -        if (old != null && old.getId() != entity.getId() && old.valid) {
 +        if (old != null && old.getId() != entity.getId() && old.valid && entity.world.paperConfig.duplicateUUIDMode != com.destroystokyo.paper.PaperWorldConfig.DuplicateUUIDMode.NOTHING) {

Spigot-Server-Patches/Entity-Tracking-Improvements.patch

@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9af242380..70694c8e5 100644
+index 16d521dfd..dd4ac4bfe 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/Entity-fromMobSpawner.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index db7e37aee..cd1639e26 100644
+index 8a04a801b..0d69e6187 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/Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -19,7 +19,7 @@ index 6ac58e5ec..ff9929a05 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c37c46e71..88092d823 100644
+index f98f93c5c..31c580de1 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/Optional-TNT-doesn-t-move-in-water.patch

@@ -32,7 +32,7 @@ index 38de48ebc..321da3be3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 70694c8e5..51b42933d 100644
+index dd4ac4bfe..34c617958 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/Properly-remove-entities-on-dimension-teleport.patch

@@ -22,7 +22,7 @@ requirement, but plugins (such as my own) use this method to
 trigger a "reload" of the entity on the client.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cd1639e26..ea42800ae 100644
+index 0d69e6187..67af3e25c 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
@@ -35,7 +35,7 @@ index cd1639e26..ea42800ae 100644
              this.world.methodProfiler.a("reposition");
              /* CraftBukkit start - Handled in calculateTarget
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4ac2d39c5..d6d3ffa6f 100644
+index 9e3804579..44d867663 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -0,0 +0,0 @@ public class WorldServer extends World implements IAsyncTaskHandler {

Spigot-Server-Patches/Use-a-Shared-Random-for-Entities.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e16579116..c0367df20 100644
+index e16579116..56aa89b45 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/Use-asynchronous-Log4j-2-loggers.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 8fd1e36283..0c4b0daf56 100644
+index a034c87d6..efa52f356 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -0,0 +0,0 @@
@@ -25,7 +25,7 @@ index 8fd1e36283..0c4b0daf56 100644
              <groupId>junit</groupId>
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 0000000000..ee7c90784c
+index 000000000..ee7c90784
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@

Spigot-Server-Patches/Vehicle-Event-Cancellation-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Vehicle Event Cancellation Changes
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 88092d823..9af242380 100644
+index 31c580de1..16d521dfd 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/add-more-information-to-Entity.toString.patch

@@ -6,15 +6,15 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 80ecdb282..99dac412f 100644
+index 67af3e25c..0e0dc72f0 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 ICommandListener, KeyedObject { // Paper
+@@ -0,0 +0,0 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
--        return String.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)});
+-        return String.format(Locale.ROOT, "%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ)});
-+        return String.format("%s[\'%s\'/%d, uuid=\'%s\', l=\'%s\', x=%.2f, y=%.2f, z=%.2f, cx=%d, cd=%d, tl=%d, v=%b, d=%b]", new Object[] { this.getClass().getSimpleName(), this.getName(), Integer.valueOf(this.id), this.uniqueID.toString(), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ), getChunkX(), getChunkZ(), this.ticksLived, this.valid, this.dead}); // Paper - add more information
++        return String.format(Locale.ROOT, "%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f, cx=%d, cz=%d, tl=%d, v=%b, d=%b]", new Object[] { this.getClass().getSimpleName(), this.getDisplayName().getText(), Integer.valueOf(this.id), this.world == null ? "~NULL~" : this.world.getWorldData().getName(), Double.valueOf(this.locX), Double.valueOf(this.locY), Double.valueOf(this.locZ), getChunkX(), getChunkZ(), this.ticksLived, this.valid, this.dead}); // Paper - add more information
      }
  
      public boolean isInvulnerable(DamageSource damagesource) {