From 4e9cddac8f3880fac3c5bdc107e1efb3d26d3466 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Fri, 18 Feb 2022 17:42:26 +0100
Subject: [PATCH] 1.18.2 pre1

---
 .../api/protocol/version/ProtocolVersion.java    |  2 +-
 .../Protocol1_18_2To1_18.java                    | 16 ++++++++++++++++
 gradle.properties                                |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index 64b00d163..f7e4dbad3 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -79,7 +79,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_17 = register(755, "1.17");
     public static final ProtocolVersion v1_17_1 = register(756, "1.17.1");
     public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1));
-    public static final ProtocolVersion v1_18_2 = register(758, 68, "1.18.2");
+    public static final ProtocolVersion v1_18_2 = register(758, 70, "1.18.2");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java
index b9228e2b1..39f55a562 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_18_2to1_18/Protocol1_18_2To1_18.java
@@ -41,6 +41,22 @@ public final class Protocol1_18_2To1_18 extends AbstractProtocol<ClientboundPack
         tagRewriter.addEmptyTag(RegistryType.BLOCK, "minecraft:fall_damage_resetting");
         tagRewriter.registerGeneric(ClientboundPackets1_18.TAGS);
 
+        registerClientbound(ClientboundPackets1_18.ENTITY_EFFECT, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // Entity id
+                map(Type.BYTE, Type.VAR_INT); // Effect id
+            }
+        });
+
+        registerClientbound(ClientboundPackets1_18.REMOVE_ENTITY_EFFECT, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.VAR_INT); // Entity id
+                map(Type.BYTE, Type.VAR_INT); // Effect id
+            }
+        });
+
         registerClientbound(ClientboundPackets1_18.JOIN_GAME, new PacketRemapper() {
             @Override
             public void registerMap() {
diff --git a/gradle.properties b/gradle.properties
index 3bdd46862..8f06d0acf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.2.0-22w07a-SNAPSHOT
+projectVersion=4.2.0-1.18.2-pre1-SNAPSHOT
 
 # Gradle properties
 org.gradle.daemon=true