From 7ba2630dd28638a12a7469d80472fd1edc68df74 Mon Sep 17 00:00:00 2001
From: KennyTV <28825609+KennyTV@users.noreply.github.com>
Date: Wed, 2 Oct 2019 09:37:18 +0200
Subject: [PATCH] Finish merge

---
 .../java/us/myles/ViaVersion/AbstractViaConfig.java    |  5 +++++
 .../protocol1_9to1_8/packets/EntityPackets.java        |  2 +-
 common/src/main/resources/assets/viaversion/config.yml |  2 --
 .../ViaVersion/sponge/platform/SpongeViaConfig.java    | 10 ----------
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java b/common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java
index 11bf5ebf8..175093948 100644
--- a/common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java
+++ b/common/src/main/java/us/myles/ViaVersion/AbstractViaConfig.java
@@ -243,6 +243,11 @@ public abstract class AbstractViaConfig extends Config implements ViaVersionConf
         return getBoolean("fix-non-full-blocklight", false);
     }
 
+    @Override
+    public boolean is1_14HealthNaNFix() {
+        return getBoolean("fix-1_14-health-nan", true);
+    }
+
     @Override
     public boolean is1_15InstantRespawn() {
         return getBoolean("use-1_15-instant-respawn", false);
diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
index 32a5e63b8..4e3b50380 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
@@ -141,7 +141,7 @@ public class EntityPackets {
                     @Override
                     public Integer transform(PacketWrapper wrapper, Short slot) throws Exception {
                         int entityId = wrapper.get(Type.VAR_INT, 0);
-                        int receiverId = wrapper.user().get(EntityTracker.class).getEntityID();
+                        int receiverId = wrapper.user().get(EntityTracker1_9.class).getClientEntityId();
                         // Normally, 0 = hand and 1-4 = armor
                         // ... but if the sent id is equal to the receiver's id, 0-3 will instead mark the armor slots
                         // (In 1.9+, every client treats the received the same: 0=hand, 1=offhand, 2-5=armor)
diff --git a/common/src/main/resources/assets/viaversion/config.yml b/common/src/main/resources/assets/viaversion/config.yml
index d965d5212..5394a40f7 100644
--- a/common/src/main/resources/assets/viaversion/config.yml
+++ b/common/src/main/resources/assets/viaversion/config.yml
@@ -130,8 +130,6 @@ change-1_14-hitbox: false
 fix-non-full-blocklight: true
 # Fixes walk animation not shown when health is set to Float.NaN
 fix-1_14-health-nan: true
-# Fixes 1.14+ clients on sub 1.14 servers having a light value of 0 for non full blocks.
-fix-non-full-blocklight: true
 # Should 1.15+ clients respawn instantly / without showing a death screen?
 use-1_15-instant-respawn: false
 #
diff --git a/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
index 79acad5f0..5193ebe3e 100644
--- a/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
+++ b/sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
@@ -59,14 +59,4 @@ public class SpongeViaConfig extends AbstractViaConfig {
     public boolean is1_14HitboxFix() {
         return false;
     }
-
-    @Override
-    public boolean isNonFullBlockLightFix() {
-        return getBoolean("fix-non-full-blocklight", true);
-    }
-
-    @Override
-    public boolean is1_14HealthNaNFix() {
-        return getBoolean("fix-1_14-health-nan", true);
-    }
 }