Merge pull request #1557 from Gerrygames/dev

Fix 1.15 entity type ids

common/src/main/java/us/myles/ViaVersion/api/entities/Entity1_15Types.java

@@ -37,11 +37,11 @@ public class Entity1_15Types {
         LLAMA_SPIT(40, ENTITY),
         TNT(59, ENTITY),
         SHULKER_BULLET(64, ENTITY),
-        FISHING_BOBBER(111, ENTITY),
+        FISHING_BOBBER(102, ENTITY),
 
         LIVINGENTITY(-1, ENTITY),
         ARMOR_STAND(1, LIVINGENTITY),
-        PLAYER(110, LIVINGENTITY),
+        PLAYER(101, LIVINGENTITY),
 
         ABSTRACT_INSENTIENT(-1, LIVINGENTITY),
         ENDER_DRAGON(19, ABSTRACT_INSENTIENT),