Version bump

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.7.8
+# ViaVersion 0.7.9
 [![Build Status](https://travis-ci.org/MylesIsCool/ViaVersion.svg?branch=master)](https://travis-ci.org/MylesIsCool/ViaVersion)
 [![Gitter](https://badges.gitter.im/MylesIsCool/ViaVersion.svg)](https://gitter.im/MylesIsCool/ViaVersion)
 
@@ -56,7 +56,7 @@ https://www.spigotmc.org/resources/viaversion.19254/history
 
 You can find unofficial dev builds here:
 
-**fillefilip8's Build Server:** http://build.fillecraft.com:8080/job/ViaVersion
+**Terrobility's Build Server:** https://ci.terrocidepvp.net/job/ViaVersion/
 
 **sgdc3's Build Server:** http://ci.xephi.fr/job/ViaVersion/
 **sgdc3's Maven:** http://ci.xephi.fr/plugin/repository/everything/

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.7.9-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>

src/main/java/us/myles/ViaVersion/api/protocol/ProtocolPipeline.java

@@ -29,7 +29,7 @@ public class ProtocolPipeline extends Protocol {
     protected void registerPackets() {
         protocolList = new LinkedList<>();
         // This is a pipeline so we register basic pipes
-        protocolList.addLast(new BaseProtocol());
+        protocolList.addLast(ProtocolRegistry.BASE_PROTOCOL);
     }
 
     @Override

src/main/java/us/myles/ViaVersion/api/protocol/ProtocolRegistry.java

@@ -2,6 +2,7 @@ package us.myles.ViaVersion.api.protocol;
 
 import org.bukkit.Bukkit;
 import us.myles.ViaVersion.api.Pair;
+import us.myles.ViaVersion.protocols.base.BaseProtocol;
 import us.myles.ViaVersion.protocols.protocol1_9_1to1_9.Protocol1_9_1TO1_9;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
@@ -13,8 +14,11 @@ public class ProtocolRegistry {
     private static Map<Integer, Map<Integer, Protocol>> registryMap = new HashMap<>();
     private static Map<Pair<Integer, Integer>, List<Pair<Integer, Protocol>>> pathCache = new HashMap<>();
     private static List<Protocol> registerList = new ArrayList<>();
+    public static final Protocol BASE_PROTOCOL = new BaseProtocol();
 
     static {
+        // Base Protocol
+        registerProtocol(BASE_PROTOCOL, Arrays.<Integer>asList(), -1);
         // Register built in protocols
         registerProtocol(new Protocol1_9TO1_8(), Collections.singletonList(ProtocolVersion.v1_9.getId()), ProtocolVersion.v1_8.getId());
         registerProtocol(new Protocol1_9_1TO1_9(), Arrays.asList(ProtocolVersion.v1_9_1.getId(), ProtocolVersion.v1_9_2.getId()), ProtocolVersion.v1_9.getId());

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/ViaIdleThread.java

@@ -50,7 +50,7 @@ public class ViaIdleThread extends BukkitRunnable {
         } catch (NoSuchFieldException | InstantiationException | IllegalArgumentException | IllegalAccessException e) {
             throw new RuntimeException("Couldn't make player idle packet, help!", e);
         }
-        if(USE_NMS) {
+        if (USE_NMS) {
             try {
                 getHandle = ReflectionUtil.obc("entity.CraftPlayer").getDeclaredMethod("getHandle");
             } catch (NoSuchMethodException | ClassNotFoundException e) {
@@ -70,6 +70,7 @@ public class ViaIdleThread extends BukkitRunnable {
             }
         }
     }
+
     @Override
     public void run() {
         for (UserConnection info : portedPlayers.values()) {
@@ -79,15 +80,19 @@ public class ViaIdleThread extends BukkitRunnable {
                     if (info.getChannel().isOpen()) {
                         if (USE_NMS) {
                             Player player = Bukkit.getPlayer(info.get(ProtocolInfo.class).getUuid());
-                            try {
-                                // Tick player
-                                Object entityPlayer = getHandle.invoke(player);
-                                Object pc = connection.get(entityPlayer);
-                                handleFlying.invoke(pc, (info.get(MovementTracker.class).isGround() ? idlePacket2 : idlePacket));
-                                // Tick world
-                                info.get(MovementTracker.class).incrementIdlePacket();
-                            } catch (IllegalAccessException | InvocationTargetException e) {
-                                e.printStackTrace();
+                            if (player != null) {
+                                try {
+                                    // Tick player
+                                    Object entityPlayer = getHandle.invoke(player);
+                                    Object pc = connection.get(entityPlayer);
+                                    if (pc != null) {
+                                        handleFlying.invoke(pc, (info.get(MovementTracker.class).isGround() ? idlePacket2 : idlePacket));
+                                        // Tick world
+                                        info.get(MovementTracker.class).incrementIdlePacket();
+                                    }
+                                } catch (IllegalAccessException | InvocationTargetException e) {
+                                    e.printStackTrace();
+                                }
                             }
                         } else {
                             // Old method using packets.

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/WorldPackets.java

@@ -226,7 +226,7 @@ public class WorldPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         int status = wrapper.get(Type.UNSIGNED_BYTE, 0);
-                        if (status == 4) {
+                        if (status == 5 || status == 4 || status == 3) {
                             EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
                             if (entityTracker.isBlocking()) {
                                 entityTracker.setBlocking(false);