diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
index fb8be24bf..68297504b 100644
--- a/build-logic/build.gradle.kts
+++ b/build-logic/build.gradle.kts
@@ -8,5 +8,5 @@ repositories {
 
 dependencies {
     // version must be manually kept in sync with the one in root project settings.gradle.kts
-    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.1")
+    implementation("gradle.plugin.com.github.johnrengelman", "shadow", "7.1.2")
 }
diff --git a/build-logic/src/main/kotlin/extensions.kt b/build-logic/src/main/kotlin/extensions.kt
index c55b057bb..c41665055 100644
--- a/build-logic/src/main/kotlin/extensions.kt
+++ b/build-logic/src/main/kotlin/extensions.kt
@@ -1,8 +1,8 @@
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.get
 import org.gradle.kotlin.dsl.named
@@ -39,6 +39,5 @@ fun Project.latestCommitHash(): String {
 }
 
 fun JavaPluginExtension.javaTarget(version: Int) {
-    sourceCompatibility = JavaVersion.toVersion(version)
-    targetCompatibility = JavaVersion.toVersion(version)
+    toolchain.languageVersion.set(JavaLanguageVersion.of(version))
 }
diff --git a/build-logic/src/main/kotlin/via.base-conventions.gradle.kts b/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
index 9fa00d2ce..9b3203b23 100644
--- a/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
+++ b/build-logic/src/main/kotlin/via.base-conventions.gradle.kts
@@ -15,6 +15,7 @@ tasks {
         (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet")
     }
     compileJava {
+        //options.release.set(8)
         options.encoding = Charsets.UTF_8.name()
         options.compilerArgs.addAll(listOf("-nowarn", "-Xlint:-unchecked", "-Xlint:-deprecation"))
     }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
index 2d52ec066..476634459 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_9to1_8/packets/SpawnPackets.java
@@ -18,6 +18,7 @@
 package com.viaversion.viaversion.protocols.protocol1_9to1_8.packets;
 
 import com.viaversion.viaversion.api.Via;
+import com.viaversion.viaversion.api.data.entity.EntityTracker;
 import com.viaversion.viaversion.api.minecraft.entities.Entity1_10Types;
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
 import com.viaversion.viaversion.api.minecraft.item.Item;
@@ -363,9 +364,10 @@ public class SpawnPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int[] entities = wrapper.get(Type.VAR_INT_ARRAY_PRIMITIVE, 0);
+                        EntityTracker tracker = wrapper.user().getEntityTracker(Protocol1_9To1_8.class);
                         for (int entity : entities) {
                             // EntityTracker
-                            wrapper.user().getEntityTracker(Protocol1_9To1_8.class).removeEntity(entity);
+                            tracker.removeEntity(entity);
                         }
                     }
                 });
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2880ba80..2e6e5897b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 01b92bfaf..a31a89053 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,6 @@ dependencyResolutionManagement {
         maven("https://repo.viaversion.com")
         maven("https://papermc.io/repo/repository/maven-public/")
         maven("https://oss.sonatype.org/content/repositories/snapshots/")
-        maven("https://nexus.velocitypowered.com/repository/velocity-artifacts-snapshots/")
         maven("https://repo.spongepowered.org/repository/maven-public/")
         maven("https://libraries.minecraft.net")
         mavenCentral()
@@ -20,7 +19,7 @@ pluginManagement {
     // default plugin versions
     plugins {
         id("net.kyori.blossom") version "1.2.0"
-        id("com.github.johnrengelman.shadow") version "7.1.1"
+        id("com.github.johnrengelman.shadow") version "7.1.2"
     }
 }