Fix config names in timing reports

patches/api/0002-Purpur-config-files.patch

@@ -1,4 +1,4 @@
-From cde36d86144f76c8c6ff5e9d0f3eac749580fa51 Mon Sep 17 00:00:00 2001
+From b7f8049479b52ec5a7c0edb6fd48ae1fa12fb7ad Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:30:03 -0600
 Subject: [PATCH] Purpur config files
@@ -9,7 +9,7 @@ Subject: [PATCH] Purpur config files
  2 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index 93d5a3f97..47be89aea 100644
+index 93d5a3f97..5e7e10c8f 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -204,9 +204,13 @@ class TimingsExport extends Thread {
@@ -21,10 +21,10 @@ index 93d5a3f97..47be89aea 100644
 -            pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null))
 +                // Purpur start
 +                pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())),
-+                pair("bukkit.yml", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
++                pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)),
-+                pair("spigot.yml", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
++                pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)),
 +                pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)),
-+                pair("purpur.yml", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
++                pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null))
 +                // Purpur end
          ));
  

patches/server/0097-Add-option-to-disable-saving-projectiles-to-disk.patch

@@ -1,10 +1,10 @@
-From ad09f029fe71871eeed9c1464aac4ec5b8e6ae1c Mon Sep 17 00:00:00 2001
+From 9cb91af96d31e248b5cfd8b4b8db86df0767f609 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 18 Feb 2020 20:07:08 -0600
 Subject: [PATCH] Add option to disable saving projectiles to disk
 
 ---
- .../net/minecraft/server/ChunkRegionLoader.java  |  2 +-
+ .../net/minecraft/server/ChunkRegionLoader.java  |  1 +
  src/main/java/net/minecraft/server/Entity.java   |  6 ++++++
  .../java/net/minecraft/server/EntityArrow.java   |  7 +++++++
  .../net/minecraft/server/EntityEnderSignal.java  |  7 +++++++
@@ -12,20 +12,13 @@ Subject: [PATCH] Add option to disable saving projectiles to disk
  .../net/minecraft/server/EntityLlamaSpit.java    |  7 +++++++
  .../net/minecraft/server/EntityProjectile.java   |  7 +++++++
  .../java/net/pl3x/purpur/PurpurWorldConfig.java  | 16 ++++++++++++++++
- 8 files changed, 58 insertions(+), 1 deletion(-)
+ 8 files changed, 58 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4349d22cc..eeff76ff4 100644
+index 4349d22cc8..647d303ad1 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-@@ -1,6 +1,5 @@
+@@ -437,6 +437,7 @@ public class ChunkRegionLoader {
- package net.minecraft.server;
- 
--import co.aikar.timings.Timings;
- import com.google.common.collect.Maps;
- import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
- import it.unimi.dsi.fastutil.longs.LongSet;
-@@ -437,6 +436,7 @@ public class ChunkRegionLoader {
  
                  while (iterator1.hasNext()) {
                      Entity entity = (Entity) iterator1.next();
@@ -34,7 +27,7 @@ index 4349d22cc..eeff76ff4 100644
                      // Paper start
                      if ((int) Math.floor(entity.locX()) >> 4 != chunk.getPos().x || (int) Math.floor(entity.locZ()) >> 4 != chunk.getPos().z) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d0ff043ea..4f9a780b8 100644
+index d0ff043ea8..4f9a780b85 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1531,6 +1531,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -51,7 +44,7 @@ index d0ff043ea..4f9a780b8 100644
          String s = this.getSaveID();
  
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 9c97edf9c..48da1e662 100644
+index 9c97edf9c9..48da1e662a 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -68,6 +68,13 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -69,7 +62,7 @@ index 9c97edf9c..48da1e662 100644
          this.av = soundeffect;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderSignal.java b/src/main/java/net/minecraft/server/EntityEnderSignal.java
-index 7ebd7da1c..74f8257ec 100644
+index 7ebd7da1c5..74f8257ecd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderSignal.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderSignal.java
 @@ -19,6 +19,13 @@ public class EntityEnderSignal extends Entity {
@@ -87,7 +80,7 @@ index 7ebd7da1c..74f8257ec 100644
          if (itemstack.getItem() != Items.ENDER_EYE || itemstack.hasTag()) {
              this.getDataWatcher().set(EntityEnderSignal.b, SystemUtils.a(itemstack.cloneItemStack(), (itemstack1) -> { // Purpur - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 5c3731f68..ce3168e5d 100644
+index 5c3731f68a..ce3168e5de 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -21,6 +21,13 @@ public class EntityFireworks extends Entity implements IProjectile {
@@ -105,7 +98,7 @@ index 5c3731f68..ce3168e5d 100644
      @Override
      public void inactiveTick() {
 diff --git a/src/main/java/net/minecraft/server/EntityLlamaSpit.java b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
-index b7a92e100..b95ee50a4 100644
+index b7a92e1002..b95ee50a4e 100644
 --- a/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 +++ b/src/main/java/net/minecraft/server/EntityLlamaSpit.java
 @@ -19,6 +19,13 @@ public class EntityLlamaSpit extends Entity implements IProjectile {
@@ -123,7 +116,7 @@ index b7a92e100..b95ee50a4 100644
      public void tick() {
          super.tick();
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index f5c8074dc..674f2ccc7 100644
+index f5c8074dcf..674f2ccc7f 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -35,6 +35,13 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -141,7 +134,7 @@ index f5c8074dc..674f2ccc7 100644
          float f5 = -MathHelper.sin(f1 * 0.017453292F) * MathHelper.cos(f * 0.017453292F);
          float f6 = -MathHelper.sin((f + f2) * 0.017453292F);
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index dff7cf169..4dbe5c077 100644
+index 2acf779b06..5bb31a0fa1 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -173,6 +173,7 @@ public class PurpurWorldConfig {