Update patches to 1.16.2

current-paper

@@ -1 +1 @@
-1.16.1-2b4ce0b37-36091f0d5d6e9e59f4851a8d405cc9c5fcdc9b76
+1.16.2-ee7dce8bd-e80bb900eb5808063f0fa48d40ce5e6d4a361861

patches/api/0001-EmpireCraft-API-POM-Changes.patch

@@ -8,7 +8,7 @@ Subject: [PATCH] EmpireCraft-API POM Changes
  1 file changed, 8 insertions(+), 9 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index fee78297a549112beb6bc2f6363b85bac28fd12f..c62a972ae2353a847ba7c47469ca17e04404f093 100644
+index 1a34f6880b45e3c46a8e29575b549f3a601721e7..1d41becaf454e030873c8e9a34aea6b882ac215a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -3,17 +3,16 @@
@@ -25,7 +25,7 @@ index fee78297a549112beb6bc2f6363b85bac28fd12f..c62a972ae2353a847ba7c47469ca17e0
 -    <groupId>com.destroystokyo.paper</groupId>
 -    <artifactId>paper-api</artifactId>
 +    <artifactId>empirecraft-api</artifactId>
-     <version>1.16.1-R0.1-SNAPSHOT</version>
+     <version>1.16.2-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
 
 -    <name>Paper-API</name>

patches/server/0001-EmpireCraft-POM-Changes.patch

@@ -10,7 +10,7 @@ Subject: [PATCH] EmpireCraft POM Changes
  3 files changed, 90 insertions(+), 13 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 2b24688310f14b6a9e3fe04fe8b41cd1803b78c1..7d81ccae66a158f62abc0aa1d960bcbf88e5fb43 100644
+index 594ab9afbd6249df8817eeb4eb50bffc986bfce1..0178147c5e05f5ef6003a67ba9eb10c796c1f341 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,10 +1,10 @@
@@ -20,7 +20,7 @@ index 2b24688310f14b6a9e3fe04fe8b41cd1803b78c1..7d81ccae66a158f62abc0aa1d960bcbf
 -    <artifactId>paper</artifactId>
 +    <artifactId>empirecraft</artifactId>
      <packaging>jar</packaging>
-     <version>1.16.1-R0.1-SNAPSHOT</version>
+     <version>1.16.2-R0.1-SNAPSHOT</version>
 -    <name>Paper</name>
 +    <name>EmpireCraft-Server</name>
      <url>https://papermc.io</url>
@@ -177,7 +177,7 @@ index 2b24688310f14b6a9e3fe04fe8b41cd1803b78c1..7d81ccae66a158f62abc0aa1d960bcbf
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index feb45475bb3c0785a8d8198615fbf4b3cd99acbe..f67a8fa0d9810508e80e7ba4f81b080c6629372c 100644
+index 082a35004f01d8877ac90f9b7b223f711943854a..a8ca6f11975e579d2be97fed9109e17fdd7c486d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -236,6 +236,7 @@ public class Main {

patches/server/0003-Empire-API.patch

@@ -122,10 +122,10 @@ index 0000000000000000000000000000000000000000..7b295bc869fd8fac878fd25fdcd3f034
 +
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d8103ab0d542ced4f30b88ceb4fc4c3eedd5d9a0..fbc8e76128dc3f7b14fcff4033c4a0c4de53939b 100644
+index 93c0afbfbafc6b9cc82d0a393f36cecb2f9ffcc1..f15f58b8deefdbf4dda616a3efd4c05111a79dee 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -270,6 +270,7 @@ public final class CraftServer implements Server {
+@@ -269,6 +269,7 @@ public final class CraftServer implements Server {
      public static Exception excessiveVelEx; // Paper - Velocity warnings
 
      static {

patches/server/0005-PlayerUseItem-Event.patch

@@ -10,10 +10,10 @@ This lets us control when an item is consumed and change the item.
  2 files changed, 76 insertions(+), 14 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1a61bc7c8a532d11981e47cadfd57e92894bf4dd..26339d571004d5b77f09a107cebf4be947256a00 100644
+index b92e74349b402b6a8687876073f974128fe242a4..92608dc9412ec67b116ee134ddbbaefff67a6ad3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2057,7 +2057,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2058,7 +2058,7 @@ public abstract class EntityLiving extends Entity {
          }
      }
 

patches/server/0006-Hidden-Item-Meta.patch

@@ -121,7 +121,7 @@ index 0000000000000000000000000000000000000000..182d711bc6c6dec3260979c59f668fd2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3c56053e3075173edd22eccb277f51a12287ab56..ba827a3a4723a5e5e175ad1bdd6f649dd2bc6f87 100644
+index ace50805bfebbf4c3485ba1de334d975830a7d3c..8929ab04525905617b91991c382d0262bb941ed8 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -60,7 +60,7 @@ public final class ItemStack {
@@ -133,7 +133,7 @@ index 3c56053e3075173edd22eccb277f51a12287ab56..ba827a3a4723a5e5e175ad1bdd6f649d
      private boolean j;
      private Entity k;
      private ShapeDetectorBlock l;
-@@ -883,8 +883,26 @@ public final class ItemStack {
+@@ -889,8 +889,26 @@ public final class ItemStack {
          IChatMutableComponent ichatmutablecomponent1 = ChatComponentUtils.a((IChatBaseComponent) ichatmutablecomponent);
 
          if (!this.j) {
@@ -162,18 +162,18 @@ index 3c56053e3075173edd22eccb277f51a12287ab56..ba827a3a4723a5e5e175ad1bdd6f649d
          }
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 31e7fb56206a522a335f5e78afd09324d1c38864..5efa7faddc9c740a1de3d8e4db3587412c4a2511 100644
+index f43193c1090238f2241b878120247d1b3d0d4e57..d40d3814344bdce3e083def4a0e5dc4934bc8c5f 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-@@ -280,6 +280,7 @@ public class PacketDataSerializer extends ByteBuf {
+@@ -290,6 +290,7 @@ public class PacketDataSerializer extends ByteBuf {
                  // Spigot end
                  nbttagcompound = itemstack.getTag();
                  // Paper start
 +                nbttagcompound = com.empireminecraft.api.HiddenItemMeta.filterItemLore(nbttagcompound, true); // EMC
                  if (nbttagcompound != null && nbttagcompound.hasKeyOfType("SkullOwner", 10)) {
                      NBTTagCompound owner = nbttagcompound.getCompound("SkullOwner");
                      if (owner.hasUUID("Id")) {
-@@ -308,6 +309,7 @@ public class PacketDataSerializer extends ByteBuf {
+@@ -318,6 +319,7 @@ public class PacketDataSerializer extends ByteBuf {
              // CraftBukkit start
              if (itemstack.getTag() != null) {
                  // Paper start - Fix skulls of same owner - restore orig ID since we changed it on send to client