From 93c84b1912407ea2014676d1609c92b401651b69 Mon Sep 17 00:00:00 2001
From: Koppe <rk01>
Date: Mon, 10 Aug 2020 22:28:40 +0200
Subject: [PATCH] minor code improvements

---
 .../protocol1_11to1_10/Protocol1_11To1_10.java       | 10 ++++++----
 .../protocol1_11to1_10/data/PotionColorMapping.java  | 12 ++++--------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
index ae927ffe8..7aef4ebe4 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
@@ -270,17 +270,19 @@ public class Protocol1_11To1_10 extends Protocol<ClientboundPackets1_9_3, Client
                 this.map(Type.INT); //effectData
                 this.map(Type.BOOLEAN); //serverwide / global
                 handler(packetWrapper -> {
-                    final int effectID = packetWrapper.get(Type.INT, 0);
+                    int effectID = packetWrapper.get(Type.INT, 0);
                     if (effectID == 2002) {
                         int data = packetWrapper.get(Type.INT, 1);
-                        final Pair<Integer, Boolean> newData = PotionColorMapping.getNewData(data);
-                        if (newData.getKey() == -1) {
+                        boolean isInstant = false;
+                        Pair<Integer, Boolean> newData = PotionColorMapping.getNewData(data);
+                        if (newData == null) {
                             Via.getPlatform().getLogger().warning("Received unknown 1.11 -> 1.10.2 potion data (" + data + ")");
                             data = 0;
                         } else {
                             data = newData.getKey();
+                            isInstant = newData.getValue();
                         }
-                        if (newData.getValue()) {
+                        if (isInstant) {
                             packetWrapper.set(Type.INT, 0, 2007);
                         }
                         packetWrapper.set(Type.INT, 1, data);
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/data/PotionColorMapping.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
index 4dafb1c23..70b131e85 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/data/PotionColorMapping.java
@@ -7,7 +7,7 @@ import us.myles.ViaVersion.api.Pair;
 public class PotionColorMapping {
 
     //<oldData> to <newData, isInstant> mapping
-    private static final Int2ObjectMap<Pair<Integer, Boolean>> POTIONS = new Int2ObjectOpenHashMap<>(17, 1.0F);
+    private static final Int2ObjectMap<Pair<Integer, Boolean>> POTIONS = new Int2ObjectOpenHashMap<>(37, 1.0F);
 
     static {
         addRewrite(0, 3694022, false);
@@ -49,15 +49,11 @@ public class PotionColorMapping {
         addRewrite(36, 3381504, false);
     }
 
-    public static Pair<Integer, Boolean> getNewData(final int oldData) {
-        return POTIONS.getOrDefault(oldData, new Pair<>(-1, false));
+    public static Pair<Integer, Boolean> getNewData(int oldData) {
+        return POTIONS.get(oldData);
     }
 
-    public static boolean contains(final int oldData) {
-        return POTIONS.containsKey(oldData);
-    }
-
-    private static void addRewrite(final int oldData, final int newData, final boolean isInstant) {
+    private static void addRewrite(int oldData, int newData, boolean isInstant) {
         POTIONS.put(oldData, new Pair<>(newData, isInstant));
     }