Version bump

* Experimental feature to fix the 'Your gamemode has been updated to ' message

* Don't fire PlayerInteractEvent twice, fix #326

README.md

@@ -1,4 +1,4 @@
-# ViaVersion 0.7.9
+# ViaVersion 0.8.0
 [![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)
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>us.myles</groupId>
     <artifactId>viaversion</artifactId>
-    <version>0.8.0-SNAPSHOT</version>
+    <version>0.8.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>ViaVersion</name>
@@ -105,6 +105,10 @@
                             <pattern>com.google.gson</pattern>
                             <shadedPattern>us.myles.viaversion.libs.gson</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>org.javassist</pattern>
+                            <shadedPattern>us.myles.viaversion.libs.javassist</shadedPattern>
+                        </relocation>
                     </relocations>
                 </configuration>
                 <executions>
@@ -157,6 +161,15 @@
             </exclusions>
         </dependency>
 
+        <!-- Javassist (Bytecode Library) -->
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <version>3.20.0-GA</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
         <!-- NBT Edit Library -->
         <dependency>
             <groupId>org.spacehq</groupId>

src/main/java/us/myles/ViaVersion/api/PacketWrapper.java

@@ -163,6 +163,21 @@ public class PacketWrapper {
         return value;
     }
 
+    /**
+     * Take all the inputs and write them to the output.
+     *
+     * @throws Exception If it failed to read or write
+     */
+    public void passthroughAll() throws Exception {
+        // Copy previous objects
+        packetValues.addAll(readableObjects);
+        readableObjects.clear();
+        // If the buffer has readable bytes, copy them.
+        if(inputBuffer.readableBytes() > 0){
+            read(Type.REMAINING_BYTES);
+        }
+    }
+
     /**
      * Write the current output to a buffer.
      *

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

@@ -7,7 +7,6 @@ import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.packets.Direction;
 import us.myles.ViaVersion.packets.PacketType;
 import us.myles.ViaVersion.packets.State;
-import us.myles.ViaVersion.protocols.base.BaseProtocol;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 
 import java.util.ArrayList;
@@ -83,7 +82,7 @@ public class ProtocolPipeline extends Protocol {
 
             // For 1.8/1.9 server version, eventually we'll probably get an API for this...
             if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_8.getId() &&
-                    ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.v1_9_2.getId()) {
+                    ProtocolRegistry.SERVER_PROTOCOL <= ProtocolVersion.v1_9_3.getId()) {
 
                 PacketType type;
                 if (ProtocolRegistry.SERVER_PROTOCOL == ProtocolVersion.v1_8.getId()) {

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

@@ -4,6 +4,7 @@ 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_9_3to1_9_1_2.Protocol1_9_3TO1_9_1_2;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 
 import java.util.*;
@@ -22,6 +23,7 @@ public class ProtocolRegistry {
         // 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());
+        registerProtocol(new Protocol1_9_3TO1_9_1_2(), Arrays.asList(ProtocolVersion.v1_9_3.getId()), ProtocolVersion.v1_9_2.getId());
     }
 
     /**

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

@@ -15,6 +15,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_9;
     public static final ProtocolVersion v1_9_1;
     public static final ProtocolVersion v1_9_2;
+    public static final ProtocolVersion v1_9_3;
 
     private final int id;
     private final String name;
@@ -26,6 +27,7 @@ public class ProtocolVersion {
         register(v1_9 = new ProtocolVersion(107, "1.9"));
         register(v1_9_1 = new ProtocolVersion(108, "1.9.1"));
         register(v1_9_2 = new ProtocolVersion(109, "1.9.2"));
+        register(v1_9_3 = new ProtocolVersion(110, "1.9.3"));
     }
 
     public static void register(@NonNull ProtocolVersion protocol) {
@@ -37,7 +39,11 @@ public class ProtocolVersion {
     }
 
     public static ProtocolVersion getProtocol(int id) {
-        return versions.get(id);
+        if (versions.containsKey(id)) {
+            return versions.get(id);
+        } else {
+            return new ProtocolVersion(id, "Unknown (" + id + ")");
+        }
     }
 
     public static List<ProtocolVersion> getProtocols() {

src/main/java/us/myles/ViaVersion/commands/defaultsubs/PPSSubCmd.java

@@ -35,6 +35,8 @@ public class PPSSubCmd extends ViaSubCommand {
         long max = 0;
 
         for (Player p : Bukkit.getOnlinePlayers()) {
+            if (!ViaVersion.getInstance().isPorted(p))
+                continue;
             int playerVersion = ViaVersion.getInstance().getPlayerVersion(p);
             if (!playerVersions.containsKey(playerVersion))
                 playerVersions.put(playerVersion, new HashSet<String>());

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_1to1_9/Protocol1_9_1TO1_9.java

@@ -9,7 +9,7 @@ import us.myles.ViaVersion.packets.State;
 public class Protocol1_9_1TO1_9 extends Protocol {
     @Override
     protected void registerPackets() {
-        // Currently supports 1.9.1 PRE 2
+        // Currently supports 1.9.1 and 1.9.2
         // Join Game Packet
         registerOutgoing(State.PLAY, 0x23, 0x23, new PacketRemapper() {
             @Override

src/main/java/us/myles/ViaVersion/protocols/protocol1_9_3to1_9_1_2/Protocol1_9_3TO1_9_1_2.java

@@ -0,0 +1,81 @@
+package us.myles.ViaVersion.protocols.protocol1_9_3to1_9_1_2;
+
+import org.spacehq.opennbt.tag.builtin.CompoundTag;
+import org.spacehq.opennbt.tag.builtin.IntTag;
+import org.spacehq.opennbt.tag.builtin.StringTag;
+import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.Position;
+import us.myles.ViaVersion.api.protocol.Protocol;
+import us.myles.ViaVersion.api.remapper.PacketHandler;
+import us.myles.ViaVersion.api.remapper.PacketRemapper;
+import us.myles.ViaVersion.api.type.Type;
+import us.myles.ViaVersion.packets.State;
+
+public class Protocol1_9_3TO1_9_1_2 extends Protocol {
+    @Override
+    protected void registerPackets() {
+
+        //Unchanged packet structure
+        registerOutgoing(State.PLAY, 0x47, 0x46); //Sound effect
+        registerOutgoing(State.PLAY, 0x48, 0x47); //Player list header and footer
+        registerOutgoing(State.PLAY, 0x49, 0x48); //Collect item
+        registerOutgoing(State.PLAY, 0x4A, 0x49); //Entity teleport
+        registerOutgoing(State.PLAY, 0x4B, 0x4A); //Entity properties
+        registerOutgoing(State.PLAY, 0x4C, 0x4B); //Entity effect
+
+        //Sign update
+        registerOutgoing(State.PLAY, 0x46, -1, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        //read data
+                        Position position = wrapper.read(Type.POSITION);
+                        String[] lines = new String[4];
+                        for (int i = 0; i < 4; i++)
+                            lines[i] = wrapper.read(Type.STRING);
+
+                        wrapper.clearInputBuffer();
+
+                        //write data
+                        wrapper.setId(0x09); //Update block entity
+                        wrapper.write(Type.POSITION, position); //Block location
+                        wrapper.write(Type.UNSIGNED_BYTE, (short) 9); //Action type (9 update sign)
+
+                        //Create nbt
+                        CompoundTag tag = new CompoundTag("");
+                        tag.put(new StringTag("id", "Sign"));
+                        tag.put(new IntTag("x", position.getX().intValue()));
+                        tag.put(new IntTag("y", position.getY().intValue()));
+                        tag.put(new IntTag("z", position.getZ().intValue()));
+                        for (int i = 0; i < lines.length; i++)
+                            tag.put(new StringTag("Text" + (i + 1), lines[i]));
+
+                        wrapper.write(Type.NBT, tag);
+                    }
+                });
+            }
+        });
+
+        registerOutgoing(State.PLAY, 0x20, 0x20, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        wrapper.passthroughAll();
+                        wrapper.write(Type.VAR_INT, 0);
+                    }
+                });
+            }
+        });
+    }
+
+    @Override
+    public void init(UserConnection userConnection) {
+
+    }
+}

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

@@ -16,10 +16,7 @@ import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.listeners.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.packets.*;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.InventoryTracker;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.MovementTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.*;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataListType;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.MetadataType;
 
@@ -62,9 +59,9 @@ public class Protocol1_9TO1_8 extends Protocol {
     }
 
     public static Item getHandItem(final UserConnection info) {
-        if(HandItemCache.CACHE){
+        if (HandItemCache.CACHE) {
             return HandItemCache.getHandItem(info.get(ProtocolInfo.class).getUuid());
-        }else {
+        } else {
             try {
                 return Bukkit.getScheduler().callSyncMethod(Bukkit.getPluginManager().getPlugin("ViaVersion"), new Callable<Item>() {
                     @Override
@@ -133,5 +130,7 @@ public class Protocol1_9TO1_8 extends Protocol {
         userConnection.put(new MovementTracker(userConnection));
         // Inventory tracker
         userConnection.put(new InventoryTracker(userConnection));
+        // Place block tracker
+        userConnection.put(new PlaceBlockTracker(userConnection));
     }
 }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/ChatRewriter.java

@@ -0,0 +1,25 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.chat;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+
+public class ChatRewriter {
+    public static void toClient(JsonObject obj, UserConnection user) {
+        //Check gamemode change
+        if (obj.get("translate") != null && obj.get("translate").getAsString().equals("gameMode.changed")) {
+            String gameMode = user.get(EntityTracker.class).getGameMode().getText();
+
+            JsonObject gameModeObject = new JsonObject();
+            gameModeObject.addProperty("text", gameMode);
+            gameModeObject.addProperty("color", "gray");
+            gameModeObject.addProperty("italic", true);
+
+            JsonArray array = new JsonArray();
+            array.add(gameModeObject);
+
+            obj.add("with", array);
+        }
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/chat/GameMode.java

@@ -0,0 +1,23 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.chat;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
+public enum GameMode {
+    SURVIVAL(0, "Survival Mode"),
+    CREATIVE(1, "Creative Mode"),
+    ADVENTURE(2, "Adventure Mode"),
+    SPECTATOR(3, "Spectator Mode");
+
+    private final int id;
+    private final String text;
+
+    public static GameMode getById(int id) {
+        for (GameMode gm : GameMode.values())
+            if (gm.getId() == id)
+                return gm;
+        return null;
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/ArmorListener.java

@@ -19,6 +19,7 @@ import org.bukkit.inventory.CraftingInventory;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.protocol.ProtocolVersion;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
@@ -39,9 +40,12 @@ public class ArmorListener implements Listener {
         if (!userConnection.get(ProtocolInfo.class).getPipeline().contains(Protocol1_9TO1_8.class)) return;
 
         int armor = ArmorType.calculateArmorPoints(player.getInventory().getArmorContents());
+        int protocol = userConnection.get(ProtocolInfo.class).getProtocolVersion();
+        ByteBuf buf = Unpooled.buffer();
         try {
-            ByteBuf buf = Unpooled.buffer();
-            Type.VAR_INT.write(buf, 0x4B); // Entity Properties
+
+            //TODO possibility to send packets by Protocol version, to let the transformer do the work
+            Type.VAR_INT.write(buf, (protocol >= ProtocolVersion.v1_9_3.getId()) ? 0x4A : 0x4B); // Entity Properties
             Type.VAR_INT.write(buf, player.getEntityId());
             buf.writeInt(1); // only 1 property
             Type.STRING.write(buf, "generic.armor");
@@ -53,6 +57,7 @@ public class ArmorListener implements Listener {
 
             ViaVersion.getInstance().sendRawPacket(player, buf);
         } catch (Exception ignored) {
+            buf.release();
         }
     }
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/listeners/DeathListener.java

@@ -38,7 +38,7 @@ public class DeathListener implements Listener {
 
     public boolean checkGamerule(World w) {
         try {
-            return Boolean.parseBoolean(w.getGameRuleValue("showDeathMessage"));
+            return Boolean.parseBoolean(w.getGameRuleValue("showDeathMessages"));
         } catch (Exception e) {
             return false;
         }

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/metadata/MetaIndex.java

@@ -157,7 +157,7 @@ public enum MetaIndex {
     }
 
     public static MetaIndex getIndex(EntityType type, int index) {
-        Class<? extends org.bukkit.entity.Entity> entityClass = type.getEntityClass();
+        Class<? extends org.bukkit.entity.Entity> entityClass = type == null ? LivingEntity.class : type.getEntityClass();
         if (entityClass == null) {
             System.out.println("Could not get entity class for " + type);
             return null;

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

@@ -1,5 +1,7 @@
 package us.myles.ViaVersion.protocols.protocol1_9to1_8.packets;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import org.bukkit.Material;
 import org.bukkit.entity.EntityType;
 import us.myles.ViaVersion.ViaVersionPlugin;
@@ -13,8 +15,11 @@ import us.myles.ViaVersion.api.remapper.ValueCreator;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.PlayerMovementMapper;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.ChatRewriter;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.GameMode;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
 
@@ -26,6 +31,19 @@ public class PlayerPackets {
             public void registerMap() {
                 map(Type.STRING, Protocol1_9TO1_8.FIX_JSON); // 0 - Chat Message (json)
                 map(Type.BYTE); // 1 - Chat Positon
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        try {
+                            JsonObject obj = (JsonObject) new JsonParser().parse(wrapper.get(Type.STRING, 0));
+                            ChatRewriter.toClient(obj, wrapper.user());
+                            wrapper.set(Type.STRING, 0, obj.toString());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                });
             }
         });
 
@@ -159,6 +177,14 @@ public class PlayerPackets {
                 map(Type.UNSIGNED_BYTE); // 4 - Max Players (Tab)
                 map(Type.STRING); // 5 - Level Type
                 map(Type.BOOLEAN); // 6 - Reduced Debug info
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        EntityTracker tracker = wrapper.user().get(EntityTracker.class);
+                        tracker.setGameMode(GameMode.getById(wrapper.get(Type.UNSIGNED_BYTE, 0))); //Set player gamemode
+                    }
+                });
             }
         });
 
@@ -228,6 +254,31 @@ public class PlayerPackets {
                             wrapper.passthrough(Type.REMAINING_BYTES); // This is so ugly, :(
                             wrapper.write(Type.VAR_INT, 0);
                         }
+                        if (name.equalsIgnoreCase("MC|TrList")) {
+                            wrapper.passthrough(Type.INT); // ID
+
+                            Short size = wrapper.passthrough(Type.UNSIGNED_BYTE);
+
+                            for (int i = 0; i < size; ++i) {
+                                Item item1 = wrapper.passthrough(Type.ITEM);
+                                ItemRewriter.toClient(item1);
+
+                                Item item2 = wrapper.passthrough(Type.ITEM);
+                                ItemRewriter.toClient(item2);
+
+                                boolean present = wrapper.passthrough(Type.BOOLEAN);
+
+                                if (present) {
+                                    Item item3 = wrapper.passthrough(Type.ITEM);
+                                    ItemRewriter.toClient(item3);
+                                }
+
+                                wrapper.passthrough(Type.BOOLEAN);
+
+                                wrapper.passthrough(Type.INT);
+                                wrapper.passthrough(Type.INT);
+                            }
+                        }
                     }
                 });
             }
@@ -257,6 +308,11 @@ public class PlayerPackets {
         protocol.registerOutgoing(State.PLAY, 0x07, 0x33, new PacketRemapper() {
             @Override
             public void registerMap() {
+                map(Type.INT); // 0 - Dimension
+                map(Type.UNSIGNED_BYTE); // 1 - Difficulty
+                map(Type.UNSIGNED_BYTE); // 2 - GameMode
+                map(Type.STRING); // 3 - Level Type
+
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
@@ -264,6 +320,28 @@ public class PlayerPackets {
                         ClientChunks cc = wrapper.user().get(ClientChunks.class);
                         cc.getBulkChunks().clear();
                         cc.getLoadedChunks().clear();
+
+                        int gamemode = wrapper.get(Type.UNSIGNED_BYTE, 0);
+                        wrapper.user().get(EntityTracker.class).setGameMode(GameMode.getById(gamemode));
+                    }
+                });
+            }
+        });
+
+        // Change Game State Packet
+        protocol.registerOutgoing(State.PLAY, 0x2B, 0x1E, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                map(Type.UNSIGNED_BYTE); //0 - Reason
+                map(Type.FLOAT); //1 - Value
+
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        if (wrapper.get(Type.UNSIGNED_BYTE, 0) == 3) { //Change gamemode
+                            int gamemode = wrapper.get(Type.FLOAT, 0).intValue();
+                            wrapper.user().get(EntityTracker.class).setGameMode(GameMode.getById(gamemode));
+                        }
                     }
                 });
             }
@@ -307,7 +385,6 @@ public class PlayerPackets {
         protocol.registerOutgoing(State.PLAY, 0x00, 0x1F); // Keep Alive Packet
         protocol.registerOutgoing(State.PLAY, 0x48, 0x32); // Resource Pack Send Packet
         protocol.registerOutgoing(State.PLAY, 0x43, 0x36); // Camera Packet
-        protocol.registerOutgoing(State.PLAY, 0x2B, 0x1E); // Change Game State Packet
 
         protocol.registerOutgoing(State.PLAY, 0x3D, 0x38); // Display Scoreboard Packet
         protocol.registerOutgoing(State.PLAY, 0x3B, 0x3F); // Scoreboard Objective Packet

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

@@ -6,6 +6,7 @@ import org.spacehq.opennbt.tag.builtin.StringTag;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.ViaVersion;
 import us.myles.ViaVersion.api.minecraft.Position;
+import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
 import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.protocol.Protocol;
 import us.myles.ViaVersion.api.remapper.PacketHandler;
@@ -13,13 +14,13 @@ import us.myles.ViaVersion.api.remapper.PacketRemapper;
 import us.myles.ViaVersion.api.remapper.ValueCreator;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.packets.State;
-import us.myles.ViaVersion.protocols.protocol1_9to1_8.ArmorType;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.ItemRewriter;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.Protocol1_9TO1_8;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds.Effect;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.sounds.SoundEffect;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.ClientChunks;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.EntityTracker;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.storage.PlaceBlockTracker;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.types.ChunkType;
 
 public class WorldPackets {
@@ -114,7 +115,10 @@ public class WorldPackets {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         ClientChunks clientChunks = wrapper.user().get(ClientChunks.class);
-                        wrapper.passthrough(new ChunkType(clientChunks));
+                        Chunk chunk = wrapper.passthrough(new ChunkType(clientChunks));
+                        if (chunk.isUnloadPacket())
+                            wrapper.setId(0x1D);
+
                         // eat any other data (Usually happens with unload packets)
                         wrapper.read(Type.REMAINING_BYTES);
                     }
@@ -345,32 +349,12 @@ public class WorldPackets {
                 handler(new PacketHandler() {
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
-                        Item item = wrapper.get(Type.ITEM, 0);
-                        if (item != null) {
-                            Material m = Material.getMaterial(item.getId());
-                            if (m != null) {
-                                // Prevent special items from sending certain info
-                                // Books
-                                boolean special = m == Material.WRITTEN_BOOK;
-                                // Buckets
-                                special = special || m == Material.WATER_BUCKET || m == Material.LAVA_BUCKET || m == Material.BUCKET;
-                                // Food
-                                special = special || m.isEdible();
-                                // Potions
-                                special = special || m == Material.POTION || m == Material.GLASS_BOTTLE;
-                                // Projectiles
-                                special = special || m == Material.BOW;
-                                special = special || m == Material.SNOW_BALL || m == Material.EGG || m == Material.EXP_BOTTLE || m == Material.ENDER_PEARL || m == Material.EYE_OF_ENDER;
-                                // Armour
-                                special = special || ArmorType.isArmor(m);
-                                // Don't send data if special
-                                if (special && m != Material.AIR) {
-                                    EntityTracker tracker = wrapper.user().get(EntityTracker.class);
-                                    tracker.setLastPlaceBlock(wrapper.user().getReceivedPackets());
-                                }
-
-                            }
-                        }
+                        Position position = wrapper.get(Type.POSITION, 0);
+                        PlaceBlockTracker tracker = wrapper.user().get(PlaceBlockTracker.class);
+                        if (tracker.getLastPlacedPosition() != null && tracker.getLastPlacedPosition().equals(position) && !tracker.isExpired(50))
+                            wrapper.cancel();
+                        tracker.updateTime();
+                        tracker.setLastPlacedPosition(position);
                     }
                 });
 

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/EntityTracker.java

@@ -22,6 +22,7 @@ import us.myles.ViaVersion.api.minecraft.item.Item;
 import us.myles.ViaVersion.api.minecraft.metadata.Metadata;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.protocols.base.ProtocolInfo;
+import us.myles.ViaVersion.protocols.protocol1_9to1_8.chat.GameMode;
 import us.myles.ViaVersion.protocols.protocol1_9to1_8.metadata.NewType;
 
 import java.util.*;
@@ -47,6 +48,8 @@ public class EntityTracker extends StoredObject {
     @Setter
     private Position currentlyDigging = null;
     private boolean teamExists = false;
+    @Setter
+    private GameMode gameMode;
 
     public EntityTracker(UserConnection user) {
         super(user);

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/storage/PlaceBlockTracker.java

@@ -0,0 +1,26 @@
+package us.myles.ViaVersion.protocols.protocol1_9to1_8.storage;
+
+import lombok.Getter;
+import lombok.Setter;
+import us.myles.ViaVersion.api.data.StoredObject;
+import us.myles.ViaVersion.api.data.UserConnection;
+import us.myles.ViaVersion.api.minecraft.Position;
+
+@Getter
+public class PlaceBlockTracker extends StoredObject {
+    private long lastPlaceTimestamp = System.currentTimeMillis();
+    @Setter
+    private Position lastPlacedPosition = null;
+
+    public PlaceBlockTracker(UserConnection user) {
+        super(user);
+    }
+
+    public boolean isExpired(int ms) {
+        return System.currentTimeMillis() > (lastPlaceTimestamp + ms);
+    }
+
+    public void updateTime() {
+        lastPlaceTimestamp = System.currentTimeMillis();
+    }
+}

src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/types/ChunkType.java

@@ -128,11 +128,6 @@ public class ChunkType extends PartialType<Chunk, ClientChunks> {
 
     @Override
     public void write(ByteBuf output, ClientChunks param, Chunk chunk) throws Exception {
-        if (chunk.isUnloadPacket()) {
-            output.clear();
-            Type.VAR_INT.write(output, 0x1D); // Unload packet ID
-        }
-
         // Write primary info
         output.writeInt(chunk.getX());
         output.writeInt(chunk.getZ());