From 9d4af8487271de1e70ca6bd4bd20f2cecb755af5 Mon Sep 17 00:00:00 2001
From: lowercasebtw <126462578+lowercasebtw@users.noreply.github.com>
Date: Thu, 28 Nov 2024 06:05:22 -0500
Subject: [PATCH] Fix footstep particle causing null kick (#4287)

---
 .../viaversion/viaversion/api/data/FullMappingsBase.java    | 2 +-
 .../v1_21to1_21_2/rewriter/ParticleRewriter1_21_2.java      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/data/FullMappingsBase.java b/api/src/main/java/com/viaversion/viaversion/api/data/FullMappingsBase.java
index 2ddb6c44c..cd108b3e7 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/data/FullMappingsBase.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/data/FullMappingsBase.java
@@ -95,7 +95,7 @@ public class FullMappingsBase implements FullMappings {
     }
 
     @Override
-    public String mappedIdentifier(final int mappedId) {
+    public @Nullable String mappedIdentifier(final int mappedId) {
         if (mappedId < 0 || mappedId >= mappedIdToString.length) {
             return null;
         }
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ParticleRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ParticleRewriter1_21_2.java
index be256e3cf..369e28a9c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ParticleRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/ParticleRewriter1_21_2.java
@@ -43,12 +43,12 @@ public final class ParticleRewriter1_21_2 extends ParticleRewriter<ClientboundPa
     @Override
     public void rewriteParticle(final UserConnection connection, final Particle particle) {
         super.rewriteParticle(connection, particle);
-
+        
         final String identifier = protocol.getMappingData().getParticleMappings().mappedIdentifier(particle.id());
-        if (identifier.equals("minecraft:dust_color_transition")) {
+        if ("minecraft:dust_color_transition".equals(identifier)) {
             floatsToARGB(particle, 0);
             floatsToARGB(particle, 1);
-        } else if (identifier.equals("minecraft:dust")) {
+        } else if ("minecraft:dust".equals(identifier)) {
             floatsToARGB(particle, 0);
         }
     }