From 5a90c8374cafaf88ced4a93b83aca5c16f52ad20 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Thu, 16 Sep 2021 15:41:14 +0200
Subject: [PATCH] Fix named sound packets and old block entities

---
 .../protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java  | 2 +-
 .../protocols/protocol1_18to1_17_1/packets/WorldPackets.java  | 4 ++++
 settings.gradle.kts                                           | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
index 823e07375..dfaaf5b19 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/Protocol1_18To1_17_1.java
@@ -42,7 +42,7 @@ public final class Protocol1_18To1_17_1 extends AbstractProtocol<ClientboundPack
 
         final SoundRewriter soundRewriter = new SoundRewriter(this);
         soundRewriter.registerSound(ClientboundPackets1_17_1.SOUND);
-        soundRewriter.registerSound(ClientboundPackets1_17_1.NAMED_SOUND);
+        soundRewriter.registerSound(ClientboundPackets1_17_1.ENTITY_SOUND);
 
         final TagRewriter tagRewriter = new TagRewriter(this);
         tagRewriter.registerGeneric(ClientboundPackets1_17_1.TAGS);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
index 6587a13e3..57344e1ca 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18to1_17_1/packets/WorldPackets.java
@@ -108,6 +108,10 @@ public final class WorldPackets {
 
                     final List<BlockEntity> blockEntities = new ArrayList<>(oldChunk.getBlockEntities().size());
                     for (final CompoundTag tag : oldChunk.getBlockEntities()) {
+                        if (!tag.contains("x") || !tag.contains("y") || !tag.contains("z") || !tag.contains("id")) {
+                            continue;
+                        }
+
                         final int x = ((NumberTag) tag.get("x")).asInt();
                         final int z = ((NumberTag) tag.get("z")).asInt();
                         final byte packedXZ = (byte) ((x & 15) << 4 | (z & 15));
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 3e411d3f2..995a746ed 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -4,7 +4,6 @@ enableFeaturePreview("VERSION_CATALOGS")
 dependencyResolutionManagement {
     // configures repositories for all projects
     repositories {
-        mavenLocal()
         maven("https://repo.viaversion.com")
         maven("https://papermc.io/repo/repository/maven-public/")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")