Update Log4J (1.8.8) (#7150)ver/1.8.8

* Update Upstream (Craftbukkit)

* update log4j

1 files changed, 64 insertions, 64 deletions

diff --git a/Spigot-Server-Patches/0003-mc-dev-imports.patch b/Spigot-Server-Patches/0003-mc-dev-imports.patch
index e9e03d6fcf..4a462253b0 100644
--- a/Spigot-Server-Patches/0003-mc-dev-imports.patch
+++ b/Spigot-Server-Patches/0003-mc-dev-imports.patch
@@ -1,4 +1,4 @@
-From e9f93a9efde92cdfd70b6d404621281f3761c519 Mon Sep 17 00:00:00 2001
+From f7aa342f8b6f462e4f53b5e1770cde6f07bfec28 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 25 May 2015 15:37:00 -0500
 Subject: [PATCH] mc-dev imports
@@ -6,7 +6,7 @@ Subject: [PATCH] mc-dev imports
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 new file mode 100644
-index 0000000..0b2277c
+index 00000000..0b2277c3
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -0,0 +1,85 @@
@@ -97,7 +97,7 @@ index 0000000..0b2277c
 +}
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
 new file mode 100644
-index 0000000..b1ae67a
+index 00000000..b1ae67ac
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -0,0 +1,489 @@
@@ -592,7 +592,7 @@ index 0000000..b1ae67a
 +}
 diff --git a/src/main/java/net/minecraft/server/BiomeMesa.java b/src/main/java/net/minecraft/server/BiomeMesa.java
 new file mode 100644
-index 0000000..fd827f2
+index 00000000..fd827f2d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BiomeMesa.java
 @@ -0,0 +1,264 @@
@@ -862,7 +862,7 @@ index 0000000..fd827f2
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
 new file mode 100644
-index 0000000..f725aea
+index 00000000..f725aea8
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -0,0 +1,455 @@
@@ -1323,7 +1323,7 @@ index 0000000..f725aea
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockFalling.java b/src/main/java/net/minecraft/server/BlockFalling.java
 new file mode 100644
-index 0000000..29f8554
+index 00000000..29f85549
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockFalling.java
 @@ -0,0 +1,75 @@
@@ -1404,7 +1404,7 @@ index 0000000..29f8554
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
 new file mode 100644
-index 0000000..b610450
+index 00000000..b6104502
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -0,0 +1,212 @@
@@ -1622,7 +1622,7 @@ index 0000000..b610450
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
 new file mode 100644
-index 0000000..2bd5499
+index 00000000..2bd54991
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -0,0 +1,260 @@
@@ -1888,7 +1888,7 @@ index 0000000..2bd5499
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderFlat.java b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
 new file mode 100644
-index 0000000..d1e10c6
+index 00000000..d1e10c6e
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkProviderFlat.java
 @@ -0,0 +1,244 @@
@@ -2138,7 +2138,7 @@ index 0000000..d1e10c6
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 new file mode 100644
-index 0000000..e0be3c1
+index 00000000..e0be3c12
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java
 @@ -0,0 +1,472 @@
@@ -2616,7 +2616,7 @@ index 0000000..e0be3c1
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderHell.java b/src/main/java/net/minecraft/server/ChunkProviderHell.java
 new file mode 100644
-index 0000000..2f01bbf
+index 00000000..2f01bbf5
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ChunkProviderHell.java
 @@ -0,0 +1,393 @@
@@ -3015,7 +3015,7 @@ index 0000000..2f01bbf
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartFurnace.java b/src/main/java/net/minecraft/server/EntityMinecartFurnace.java
 new file mode 100644
-index 0000000..55f04b4
+index 00000000..55f04b47
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/EntityMinecartFurnace.java
 @@ -0,0 +1,145 @@
@@ -3166,7 +3166,7 @@ index 0000000..55f04b4
 +}
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
 new file mode 100644
-index 0000000..57b3d9d
+index 00000000..57b3d9d0
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -0,0 +1,100 @@
@@ -3272,7 +3272,7 @@ index 0000000..57b3d9d
 +}
 diff --git a/src/main/java/net/minecraft/server/ItemMilkBucket.java b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 new file mode 100644
-index 0000000..91ea70d
+index 00000000..91ea70d0
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/ItemMilkBucket.java
 @@ -0,0 +1,35 @@
@@ -3313,7 +3313,7 @@ index 0000000..91ea70d
 +}
 diff --git a/src/main/java/net/minecraft/server/MobEffectAttackDamage.java b/src/main/java/net/minecraft/server/MobEffectAttackDamage.java
 new file mode 100644
-index 0000000..620685a
+index 00000000..620685ad
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MobEffectAttackDamage.java
 @@ -0,0 +1,12 @@
@@ -3331,7 +3331,7 @@ index 0000000..620685a
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
 new file mode 100644
-index 0000000..d5eaa24
+index 00000000..d5eaa241
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -0,0 +1,222 @@
@@ -3557,9 +3557,50 @@ index 0000000..d5eaa24
 +
 +    protected abstract boolean a(Vec3D vec3d, Vec3D vec3d1, int i, int j, int k);
 +}
+diff --git a/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java b/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java
+new file mode 100644
+index 00000000..1d2e8556
+--- /dev/null
++++ b/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java
+@@ -0,0 +1,35 @@
++package net.minecraft.server;
++
++import java.io.IOException;
++import java.security.PrivateKey;
++import javax.crypto.SecretKey;
++
++public class PacketLoginInEncryptionBegin implements Packet<PacketLoginInListener> {
++
++    private byte[] a = new byte[0];
++    private byte[] b = new byte[0];
++
++    public PacketLoginInEncryptionBegin() {}
++
++    public void a(PacketDataSerializer packetdataserializer) throws IOException {
++        this.a = packetdataserializer.a();
++        this.b = packetdataserializer.a();
++    }
++
++    public void b(PacketDataSerializer packetdataserializer) throws IOException {
++        packetdataserializer.a(this.a);
++        packetdataserializer.a(this.b);
++    }
++
++    public void a(PacketLoginInListener packetlogininlistener) {
++        packetlogininlistener.a(this);
++    }
++
++    public SecretKey a(PrivateKey privatekey) {
++        return MinecraftEncryption.a(privatekey, this.a);
++    }
++
++    public byte[] b(PrivateKey privatekey) {
++        return privatekey == null ? this.b : MinecraftEncryption.b(privatekey, this.b);
++    }
++}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 new file mode 100644
-index 0000000..1606d6d
+index 00000000..1606d6d9
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 @@ -0,0 +1,33 @@
@@ -3598,7 +3639,7 @@ index 0000000..1606d6d
 +}
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 new file mode 100644
-index 0000000..2711298
+index 00000000..27112986
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -0,0 +1,103 @@
@@ -3707,7 +3748,7 @@ index 0000000..2711298
 +}
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 new file mode 100644
-index 0000000..6014b09
+index 00000000..6014b092
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -0,0 +1,23 @@
@@ -3736,7 +3777,7 @@ index 0000000..6014b09
 +}
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
 new file mode 100644
-index 0000000..0a14c9d
+index 00000000..0a14c9d4
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -0,0 +1,219 @@
@@ -3961,7 +4002,7 @@ index 0000000..0a14c9d
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 new file mode 100644
-index 0000000..794cdc8
+index 00000000..794cdc80
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -0,0 +1,87 @@
@@ -4054,7 +4095,7 @@ index 0000000..794cdc8
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntityLightDetector.java b/src/main/java/net/minecraft/server/TileEntityLightDetector.java
 new file mode 100644
-index 0000000..f75e2de
+index 00000000..f75e2de6
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/TileEntityLightDetector.java
 @@ -0,0 +1,16 @@
@@ -4074,47 +4115,6 @@ index 0000000..f75e2de
 +
 +    }
 +}
-diff --git a/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java b/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java
-new file mode 100644
-index 0000000..1d2e855
---- /dev/null
-+++ b/src/main/java/net/minecraft/server/PacketLoginInEncryptionBegin.java
-@@ -0,0 +1,35 @@
-+package net.minecraft.server;
-+
-+import java.io.IOException;
-+import java.security.PrivateKey;
-+import javax.crypto.SecretKey;
-+
-+public class PacketLoginInEncryptionBegin implements Packet<PacketLoginInListener> {
-+
-+    private byte[] a = new byte[0];
-+    private byte[] b = new byte[0];
-+
-+    public PacketLoginInEncryptionBegin() {}
-+
-+    public void a(PacketDataSerializer packetdataserializer) throws IOException {
-+        this.a = packetdataserializer.a();
-+        this.b = packetdataserializer.a();
-+    }
-+
-+    public void b(PacketDataSerializer packetdataserializer) throws IOException {
-+        packetdataserializer.a(this.a);
-+        packetdataserializer.a(this.b);
-+    }
-+
-+    public void a(PacketLoginInListener packetlogininlistener) {
-+        packetlogininlistener.a(this);
-+    }
-+
-+    public SecretKey a(PrivateKey privatekey) {
-+        return MinecraftEncryption.a(privatekey, this.a);
-+    }
-+
-+    public byte[] b(PrivateKey privatekey) {
-+        return privatekey == null ? this.b : MinecraftEncryption.b(privatekey, this.b);
-+    }
-+}
 -- 
-2.7.1
+2.34.0