Merge pull request #1302 from creeper123123321/master

Workaround for packet order issue in neighbour chunk updates

bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeEncodeHandler.java

@@ -5,6 +5,7 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.bungee.util.BungeePipelineUtil;
@@ -28,7 +29,7 @@ public class BungeeEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
     @Override
     protected void encode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
         if (bytebuf.readableBytes() == 0) {
-            throw new CancelException();
+            throw Via.getManager().isDebug() ? new CancelException() : CancelException.CACHED;
         }
         boolean needsCompress = false;
         if (!handledCompression) {

common/src/main/java/us/myles/ViaVersion/api/protocol/Protocol.java

@@ -167,8 +167,9 @@ public abstract class Protocol {
         // remap
         if (protocolPacket.getRemapper() != null) {
             protocolPacket.getRemapper().remap(packetWrapper);
-            if (packetWrapper.isCancelled())
+            if (packetWrapper.isCancelled()) {
-                throw new CancelException();
+                throw Via.getManager().isDebug() ? new CancelException() : CancelException.CACHED;
+            }
         }
     }
 

common/src/main/java/us/myles/ViaVersion/exception/CancelException.java

@@ -1,4 +1,29 @@
 package us.myles.ViaVersion.exception;
 
 public class CancelException extends Exception {
+    public static final CancelException CACHED = new CancelException("Cached - Enable /viaver debug to not use cached exception") {
+        @Override
+        public synchronized Throwable fillInStackTrace() {
+            return this;
+        }
+    };
+
+    public CancelException() {
+    }
+
+    public CancelException(String message) {
+        super(message);
+    }
+
+    public CancelException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public CancelException(Throwable cause) {
+        super(cause);
+    }
+
+    public CancelException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+    }
 }

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/blockconnections/ConnectionData.java

@@ -118,7 +118,7 @@ public class ConnectionData {
                     wrapper.write(Type.INT, chunkZ + chunkDeltaZ);
                     wrapper.write(Type.BLOCK_CHANGE_RECORD_ARRAY, updates.toArray(new BlockChangeRecord[0]));
                     try {
-                        wrapper.send(Protocol1_13To1_12_2.class);
+                        wrapper.send(Protocol1_13To1_12_2.class, true, true);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/WorldPackets.java

@@ -366,10 +366,6 @@ public class WorldPackets {
                             }
                         }
 
-                        if (Via.getConfig().isServersideBlockConnections()) {
-                            ConnectionData.connectBlocks(wrapper.user(), chunk);
-                        }
-
                         // Rewrite biome id 255 to plains
                         if (chunk.isBiomeData()) {
                             int latestBiomeWarn = Integer.MIN_VALUE;
@@ -405,6 +401,18 @@ public class WorldPackets {
                                 chunk.getSections()[y >> 4].setFlatBlock(x & 0xF, y & 0xF, z & 0xF, newId);
                             }
                         }
+
+                        if (Via.getConfig().isServersideBlockConnections()) {
+                            ConnectionData.connectBlocks(wrapper.user(), chunk);
+                            // Workaround for packet order issue
+                            wrapper.send(Protocol1_13To1_12_2.class, true, true);
+                            wrapper.cancel();
+                            for (int i = 0; i < chunk.getSections().length; i++) {
+                                ChunkSection section = chunk.getSections()[i];
+                                if (section == null) continue;
+                                ConnectionData.updateChunkSectionNeighbours(wrapper.user(), chunk.getX(), chunk.getZ(), i);
+                            }
+                        }
                     }
                 });
             }

sponge/src/main/java/us/myles/ViaVersion/sponge/handlers/SpongeEncodeHandler.java

@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToByteEncoder;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.exception.CancelException;
@@ -37,7 +38,7 @@ public class SpongeEncodeHandler extends MessageToByteEncoder {
             }
         }
         if (bytebuf.readableBytes() == 0) {
-            throw new CancelException();
+            throw Via.getManager().isDebug() ? new CancelException() : CancelException.CACHED;
         }
         // Increment sent
         info.incrementSent();

velocity/src/main/java/us/myles/ViaVersion/velocity/handlers/VelocityEncodeHandler.java

@@ -9,6 +9,7 @@ import io.netty.handler.codec.MessageToMessageEncoder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import us.myles.ViaVersion.api.PacketWrapper;
+import us.myles.ViaVersion.api.Via;
 import us.myles.ViaVersion.api.data.UserConnection;
 import us.myles.ViaVersion.api.type.Type;
 import us.myles.ViaVersion.exception.CancelException;
@@ -28,7 +29,7 @@ public class VelocityEncodeHandler extends MessageToMessageEncoder<ByteBuf> {
     @Override
     protected void encode(final ChannelHandlerContext ctx, ByteBuf bytebuf, List<Object> out) throws Exception {
         if (bytebuf.readableBytes() == 0) {
-            throw new CancelException();
+            throw Via.getManager().isDebug() ? new CancelException() : CancelException.CACHED;
         }
         boolean needsCompress = false;
         if (!handledCompression