Version bump

* Cancel swap item, fix #364

* Remove canceling drop item

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.7.7
+# 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.8-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/Protocol1_9TO1_8.java

@@ -106,7 +106,7 @@ public class Protocol1_9TO1_8 extends Protocol {
             Bukkit.getPluginManager().registerEvents(new PaperPatch(), plugin);
         }
         if (plugin.getConfig().getBoolean("simulate-pt", true))
-            new ViaIdleThread(plugin.getPortedPlayers()).runTaskTimerAsynchronously(plugin, 1L, 1L); // Updates player's idle status
+            new ViaIdleThread(plugin.getPortedPlayers()).runTaskTimer(plugin, 1L, 1L); // Updates player's idle status
         if (plugin.getConfig().getBoolean("item-cache", true)) {
             new HandItemCache().runTaskTimerAsynchronously(plugin, 2L, 2L); // Updates player's items :)
             HandItemCache.CACHE = true;

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

@@ -1,7 +1,11 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8;
 
 import io.netty.channel.ChannelHandlerContext;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
+import us.myles.ViaVersion.ViaVersionPlugin;
+import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker;
@@ -9,18 +13,33 @@ import us.myles.ViaVersion.util.PipelineUtil;
 import us.myles.ViaVersion.util.ReflectionUtil;
 
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.UUID;
 
 public class ViaIdleThread extends BukkitRunnable {
+    private static boolean USE_NMS = true;
     private final Map<UUID, UserConnection> portedPlayers;
-    private final Object idlePacket;
-    private final Object idlePacket2;
+    // Used for packet mode
+    private Object idlePacket;
+    private Object idlePacket2;
+    // Use for nms
+    private Method getHandle;
+    private Field connection;
+    private Method handleFlying;
 
     public ViaIdleThread(Map<UUID, UserConnection> portedPlayers) {
+        USE_NMS = ((ViaVersionPlugin) ViaVersion.getInstance()).getConfig().getBoolean("nms-player-ticking", true);
+
         this.portedPlayers = portedPlayers;
+        Class<?> idlePacketClass;
+        try {
+            idlePacketClass = ReflectionUtil.nms("PacketPlayInFlying");
+        } catch (ClassNotFoundException e) {
+            throw new RuntimeException("Couldn't find idle packet, help!", e);
+        }
         try {
-            Class<?> idlePacketClass = ReflectionUtil.nms("PacketPlayInFlying");
             idlePacket = idlePacketClass.newInstance();
             idlePacket2 = idlePacketClass.newInstance();
 
@@ -28,8 +47,27 @@ public class ViaIdleThread extends BukkitRunnable {
             flying.setAccessible(true);
 
             flying.set(idlePacket2, true);
-        } catch (NoSuchFieldException | InstantiationException | IllegalArgumentException | IllegalAccessException | ClassNotFoundException e) {
-            throw new RuntimeException("Couldn't find/make player idle packet, help!", e);
+        } catch (NoSuchFieldException | InstantiationException | IllegalArgumentException | IllegalAccessException e) {
+            throw new RuntimeException("Couldn't make player idle packet, help!", e);
+        }
+        if (USE_NMS) {
+            try {
+                getHandle = ReflectionUtil.obc("entity.CraftPlayer").getDeclaredMethod("getHandle");
+            } catch (NoSuchMethodException | ClassNotFoundException e) {
+                throw new RuntimeException("Couldn't find CraftPlayer", e);
+            }
+
+            try {
+                connection = ReflectionUtil.nms("EntityPlayer").getDeclaredField("playerConnection");
+            } catch (NoSuchFieldException | ClassNotFoundException e) {
+                throw new RuntimeException("Couldn't find Player Connection", e);
+            }
+
+            try {
+                handleFlying = ReflectionUtil.nms("PlayerConnection").getDeclaredMethod("a", idlePacketClass);
+            } catch (NoSuchMethodException | ClassNotFoundException e) {
+                throw new RuntimeException("Couldn't find CraftPlayer", e);
+            }
         }
     }
 
@@ -39,15 +77,34 @@ public class ViaIdleThread extends BukkitRunnable {
             if (info.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) {
                 long nextIdleUpdate = info.get(MovementTracker.class).getNextIdlePacket();
                 if (nextIdleUpdate <= System.currentTimeMillis()) {
-                    ChannelHandlerContext context = PipelineUtil.getContextBefore("decoder", info.getChannel().pipeline());
                     if (info.getChannel().isOpen()) {
-                        if (context != null) {
-                            if (info.get(MovementTracker.class).isGround()) {
-                                context.fireChannelRead(idlePacket2);
-                            } else {
-                                context.fireChannelRead(idlePacket);
+                        if (USE_NMS) {
+                            Player player = Bukkit.getPlayer(info.get(ProtocolInfo.class).getUuid());
+                            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.
+                            ChannelHandlerContext context = PipelineUtil.getContextBefore("decoder", info.getChannel().pipeline());
+                            if (context != null) {
+                                if (info.get(MovementTracker.class).isGround()) {
+                                    context.fireChannelRead(idlePacket2);
+                                } else {
+                                    context.fireChannelRead(idlePacket);
+                                }
+                                info.get(MovementTracker.class).incrementIdlePacket();
                             }
-                            info.get(MovementTracker.class).incrementIdlePacket();
                         }
                     }
                 }

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

@@ -217,7 +217,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 == 6)
                             wrapper.cancel();
                     }
                 });
@@ -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);

src/main/resources/config.yml

@@ -16,6 +16,8 @@ hologram-patch: false
 hologram-y: -1
 # Enable player tick simulation, this fixes eating, drinking, nether portals.
 simulate-pt: true
+# Should we use nms player to simulate packets, (may fix anti-cheat issues)
+nms-player-ticking: true
 # Should we patch boss bars so they work? (Default: true, disable if you're having issues)
 bossbar-patch: true
 # If your boss bar flickers on 1.9, set this to 'true'. It will keep all boss bars on 100% (not recommended)