Upstream several patches and cleanup

patches/server/0001-Fix-Decompilation-errors.patch

@@ -1,11 +1,26 @@
-From 97eb4c50bb22267d87f9e136ce1e6e85f1c27032 Mon Sep 17 00:00:00 2001
+From 01800bd76642402904fc77ba7522ddc87166f206 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Mon, 6 Aug 2018 16:39:57 -0700
 Subject: [PATCH] Fix Decompilation errors
 
 
+diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
+index 81c45a95..c27709e1 100644
+--- a/src/main/java/net/minecraft/server/IEntitySelector.java
++++ b/src/main/java/net/minecraft/server/IEntitySelector.java
+@@ -61,8 +61,8 @@ public final class IEntitySelector {
+             }
+         }
+
+-        public boolean apply(Object object) {
+-            return this.a((Entity) object);
++        public boolean apply(Entity entity) {
++            return this.a(entity);
+         }
+     }
+ }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index f55bedaff..a8fc3361a 100644
+index f55bedaf..a8fc3361 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -46,10 +46,6 @@ public class PacketPlayInUseEntity implements Packet<PacketListenerPlayIn> {
@@ -20,7 +35,7 @@ index f55bedaff..a8fc3361a 100644
 
          INTERACT, ATTACK, INTERACT_AT;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java
-index c5be70f8b..62492650a 100644
+index c5be70f8..62492650 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutEntityMetadata.java
 @@ -33,8 +33,4 @@ public class PacketPlayOutEntityMetadata implements Packet<PacketListenerPlayOut
@@ -33,7 +48,7 @@ index c5be70f8b..62492650a 100644
 -    }
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java
-index ab4520ba2..fc5ad2911 100644
+index ab4520ba..fc5ad291 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerInfo.java
 @@ -172,10 +172,6 @@ public class PacketPlayOutPlayerInfo implements Packet<PacketListenerPlayOut> {
@@ -48,7 +63,7 @@ index ab4520ba2..fc5ad2911 100644
 
          static final int[] a = new int[PacketPlayOutPlayerInfo.EnumPlayerInfoAction.values().length];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index 90606f50b..4b8eb3eed 100644
+index 90606f50..4b8eb3ee 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -109,8 +109,4 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -61,5 +76,5 @@ index 90606f50b..4b8eb3eed 100644
 -    }
  }
 -- 
-2.18.0
+2.50.0
 

patches/server/0192-Fire-block-place-sounds-inside-event-logic-chain.patch

@@ -1,8 +1,9 @@
-From c15ba6929156883bd38984ee5dddd4fc6bb1cec3 Mon Sep 17 00:00:00 2001
+From 7416a303a8a65d7656d0f4dca57ba17a52fdb0ac Mon Sep 17 00:00:00 2001
 From: Austin Mayes <austin@avicus.net>
 Date: Mon, 26 Oct 2020 21:02:04 -0500
 Subject: [PATCH] Fire block place sounds inside event logic chain
 
+Co-authored-by: David Rodriguez <15853933+limbo56@users.noreply.github.com>
 
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
 index 0cd41754..c6b313a7 100644
@@ -19,22 +20,23 @@ index 0cd41754..c6b313a7 100644
              }
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 55be2b71..c54050bf 100644
+index 55be2b71..92657b61 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -219,6 +219,12 @@ public final class ItemStack {
+@@ -219,6 +219,13 @@ public final class ItemStack {
                      }
                  }
 
 +                // SPIGOT-1288 - play sound stripped from ItemBlock
 +                if (this.getItem() instanceof ItemBlock) {
 +                    Block base = ((ItemBlock) this.getItem()).a;
-+                    world.makeSound((double) ((float) blockposition.getX() + 0.5F), (double) ((float) blockposition.getY() + 0.5F), (double) ((float) blockposition.getZ() + 0.5F), base.stepSound.getPlaceSound(), (base.stepSound.getVolume1() + 1.0F) / 2.0F, base.stepSound.getVolume2() * 0.8F);
++                    BlockPosition bp = blockposition.shift(enumdirection);
++                    world.makeSound((double) ((float) bp.getX() + 0.5F), (double) ((float) bp.getY() + 0.5F), (double) ((float) bp.getZ() + 0.5F), base.stepSound.getPlaceSound(), (base.stepSound.getVolume1() + 1.0F) / 2.0F, base.stepSound.getVolume2() * 0.8F);
 +                }
 +
                  entityhuman.b(StatisticList.USE_ITEM_COUNT[Item.getId(this.item)]);
              }
          }
 -- 
-2.23.0
+2.50.0
 

patches/server/0212-Update-to-Netty-4.1.x.patch → patches/server/0212-Update-to-Netty-4.1.118.patch

@@ -1,11 +1,11 @@
-From fba402aaeddb102e5c129501882793e896546082 Mon Sep 17 00:00:00 2001
+From 3f47e449dda883c211475e9924be1492d20ac99b Mon Sep 17 00:00:00 2001
 From: hpfxd <me@hpfxd.com>
 Date: Wed, 27 Oct 2021 06:29:44 -0400
-Subject: [PATCH] Update to Netty 4.1.x
+Subject: [PATCH] Update to Netty 4.1.118
 
 
 diff --git a/pom.xml b/pom.xml
-index d8e35ef2..a52663c2 100644
+index d8e35ef2..2a02fbcb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -27,6 +27,11 @@
@@ -15,11 +15,19 @@ index d8e35ef2..a52663c2 100644
 +        <dependency>
 +            <groupId>io.netty</groupId>
 +            <artifactId>netty-all</artifactId>
-+            <version>4.1.105.Final</version>
++            <version>4.1.118.Final</version>
 +        </dependency>
          <dependency>
              <groupId>it.unimi.dsi</groupId>
              <artifactId>fastutil</artifactId>
+@@ -228,6 +233,7 @@
+                                 <filter>
+                                     <artifact>org.spigotmc:minecraft-server:**</artifact>
+                                     <excludes>
++                                        <exclude>io/netty/**</exclude>
+                                         <exclude>org/apache/logging/log4j/**</exclude>
+                                     </excludes>
+                                 </filter>
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 index e2eb3054..9a075fef 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java

patches/server/0215-Resolve-build-issues-with-Java-17.patch

@@ -1,12 +1,12 @@
-From 8385e00a18e6f82355cc012a6d90f9635761eed5 Mon Sep 17 00:00:00 2001
+From 91bff9166c187ff003d0d6037026a421df907c50 Mon Sep 17 00:00:00 2001
 From: "BT (calcastor/mame)" <43831917+calcastor@users.noreply.github.com>
 Date: Mon, 6 Feb 2023 23:30:48 -0800
 Subject: [PATCH] Resolve build issues with Java 17
 
 https://github.com/CobbleSword/NachoSpigot/commit/944e02c131b4f4f12a3140778fc9d681f773ae2c
 
 diff --git a/pom.xml b/pom.xml
-index a52663c2..4aff3f3d 100644
+index 2a02fbcb..f38265d6 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -105,12 +105,7 @@
@@ -22,7 +22,7 @@ index a52663c2..4aff3f3d 100644
          <!-- PaperSpigot - Repo for gitdescribe -->
          <pluginRepository>
              <id>papermc</id> <!-- Paper - Update Log4j -->
-@@ -292,22 +287,7 @@
+@@ -293,22 +288,7 @@
              <plugin>
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>