Update Log4J (1.10.2) (#7152)ver/1.10.2

* Update Upstream (Craftbukkit)

* update log4j

1 files changed, 39 insertions, 40 deletions

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index ef7bd986b9..7b09f4cdcb 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,29 +1,29 @@
-From cc65e1b66b14dc2f2ef8ee68689bdee6201c1fd0 Mon Sep 17 00:00:00 2001
+From 398cecff8974e34d74881b9f13977d35999d5279 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
 
 
 diff --git a/pom.xml b/pom.xml
-index 4ae34c8..63aaa7a 100644
+index d0a5c6351..1f518dd2d 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -65,6 +65,12 @@
+@@ -70,6 +70,12 @@
+             <version>5.1.37</version>
              <scope>compile</scope>
          </dependency>
-         <dependency>
++        <dependency>
 +            <groupId>co.aikar</groupId>
 +            <artifactId>fastutil-lite</artifactId>
 +            <version>1.0</version>
 +            <scope>compile</scope>
 +        </dependency>
-+        <dependency>
+         <dependency>
              <groupId>net.sf.trove4j</groupId>
              <artifactId>trove4j</artifactId>
-             <version>3.0.3</version>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
 new file mode 100644
-index 0000000..29838de
+index 000000000..29838de47
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -0,0 +1,114 @@
@@ -143,7 +143,7 @@ index 0000000..29838de
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedChunkGenerator.java b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 new file mode 100644
-index 0000000..2bf5b66
+index 000000000..2bf5b662c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedChunkGenerator.java
 @@ -0,0 +1,126 @@
@@ -275,7 +275,7 @@ index 0000000..2bf5b66
 +}
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 new file mode 100644
-index 0000000..e778911
+index 000000000..e7789117b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -0,0 +1,101 @@
@@ -381,7 +381,7 @@ index 0000000..e778911
 +    }
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 3d0a005..f509bed 100644
+index 3d0a00512..f509bed8a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -14,11 +14,14 @@ import java.util.concurrent.TimeUnit;
@@ -425,7 +425,7 @@ index 3d0a005..f509bed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index a106e44..d17160a 100644
+index a106e4452..d17160af2 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -33,6 +33,15 @@ public class Block {
@@ -445,7 +445,7 @@ index a106e44..d17160a 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b651edc..5807bb8 100644
+index b651edc5e..5807bb8ce 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -900,7 +900,7 @@ public class Chunk {
@@ -493,7 +493,7 @@ index b651edc..5807bb8 100644
  
      private void z() {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5682f03..1380815 100644
+index 5682f03c0..13808152c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -194,7 +194,7 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -515,7 +515,7 @@ index 5682f03..1380815 100644
              this.chunkLoader.a(this.world, chunk);
          } catch (IOException ioexception) {
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f604639..17dd7bb 100644
+index f604639f4..17dd7bb41 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -394,7 +394,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -555,7 +555,7 @@ index f604639..17dd7bb 100644
          // return chunk; // CraftBukkit
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 11a49a3..e70d5c5 100644
+index 11a49a3c9..e70d5c53a 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -23,7 +23,7 @@ import java.io.PrintStream;
@@ -586,7 +586,7 @@ index 11a49a3..e70d5c5 100644
  
      public boolean aa() {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6434566..1409faa 100644
+index 6434566a4..1409faa00 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -625,7 +625,7 @@ index 6434566..1409faa 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 365b61d..0a583bc 100644
+index 365b61d99..0a583bc3d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -26,7 +26,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -696,7 +696,7 @@ index 365b61d..0a583bc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
-index 5432e70..72cd51a 100644
+index 5432e70b1..72cd51abe 100644
 --- a/src/main/java/net/minecraft/server/EntityTracker.java
 +++ b/src/main/java/net/minecraft/server/EntityTracker.java
 @@ -171,7 +171,7 @@ public class EntityTracker {
@@ -727,7 +727,7 @@ index 5432e70..72cd51a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26f8467..4814643 100644
+index 26f846725..481464326 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,7 +45,7 @@ import org.bukkit.Bukkit;
@@ -869,7 +869,7 @@ index 26f8467..4814643 100644
          this.methodProfiler.b();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index b0249ff..797a84f 100644
+index b0249ffc0..797a84f9b 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1,5 +1,6 @@
@@ -969,7 +969,7 @@ index b0249ff..797a84f 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 29f0062..d910c41 100644
+index 29f00627b..d910c4189 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -1017,7 +1017,7 @@ index 29f0062..d910c41 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7090262..2e418a7 100644
+index 7090262d4..2e418a7c4 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -1041,7 +1041,7 @@ index 7090262..2e418a7 100644
  
      public void addWhitelist(GameProfile gameprofile) {
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 8dd434c..c965af1 100644
+index 8dd434c4d..c965af1e7 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -1,5 +1,7 @@
@@ -1083,7 +1083,7 @@ index 8dd434c..c965af1 100644
          return flag;
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 42f37df..2b82312 100644
+index 42f37dfc0..2b8231224 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -6,12 +6,13 @@ import javax.annotation.Nullable;
@@ -1103,7 +1103,7 @@ index 42f37df..2b82312 100644
      private static final Map<String, Class<? extends TileEntity>> f = Maps.newHashMap();
      private static final Map<Class<? extends TileEntity>, String> g = Maps.newHashMap();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e649435..b73f64e 100644
+index e64943591..b73f64ee9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -18,11 +18,11 @@ import com.google.common.collect.Maps;
@@ -1209,7 +1209,7 @@ index e649435..b73f64e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 50fad7c..3d98392 100644
+index 50fad7cd6..3d9839289 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -246,13 +246,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -1342,10 +1342,10 @@ index 50fad7c..3d98392 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index e7e9941..5f2a9b0 100644
+index e7e994139..5f2a9b087 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1727,6 +1727,7 @@ public final class CraftServer implements Server {
+@@ -1727,12 +1727,31 @@ public final class CraftServer implements Server {
      private final Spigot spigot = new Spigot()
      {
  
@@ -1353,10 +1353,10 @@ index e7e9941..5f2a9b0 100644
          @Override
          public YamlConfiguration getConfig()
          {
-@@ -1734,6 +1735,24 @@ public final class CraftServer implements Server {
+             return org.spigotmc.SpigotConfig.config;
          }
  
-         @Override
++        @Override
 +        public YamlConfiguration getBukkitConfig()
 +        {
 +            return configuration;
@@ -1374,13 +1374,12 @@ index e7e9941..5f2a9b0 100644
 +            return com.destroystokyo.paper.PaperConfig.config;
 +        }
 +
-+        @Override
+         @Override
          public void restart() {
              org.spigotmc.RestartCommand.restart();
-         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 41d2d87..0000000
+index 41d2d87ee..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
 @@ -1,173 +0,0 @@
@@ -1558,7 +1557,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
-index 3a95b44..b5efb9c 100644
+index 3a95b4465..b5efb9c3f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java
 @@ -1,6 +1,8 @@
@@ -1602,7 +1601,7 @@ index 3a95b44..b5efb9c 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 4e3b8fc..8ee4fc4 100644
+index 80cafee86..a21259701 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1636,7 +1635,7 @@ index 4e3b8fc..8ee4fc4 100644
  
      public Player.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 92d217b..198c37c 100644
+index 92d217bce..198c37c3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -189,7 +189,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -1677,7 +1676,7 @@ index 92d217b..198c37c 100644
                      task.getOwner().getLogger().log(
                              Level.WARNING,
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
-index 220e39a..afc6c17 100644
+index 220e39abe..afc6c17e6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftTask.java
 @@ -1,8 +1,8 @@
@@ -1759,7 +1758,7 @@ index 220e39a..afc6c17 100644
 -    // Spigot end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
-index e52ef47..3d90b34 100644
+index e52ef47b7..3d90b3426 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java
 @@ -5,6 +5,7 @@ import org.bukkit.util.CachedServerIcon;
@@ -1771,7 +1770,7 @@ index e52ef47..3d90b34 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 30efc99..eb30abe 100644
+index 30efc9937..eb30abe97 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -29,7 +29,7 @@ import net.minecraft.server.EntityWither;
@@ -1833,5 +1832,5 @@ index 30efc99..eb30abe 100644
      }
  }
 -- 
-2.9.3
+2.34.0