From 9c81ba368f6b1c7975eb530d11e2244ba364f27f Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Mon, 8 Jun 2020 17:46:18 +0200
Subject: [PATCH] Cancel block change packets for removed actions

---
 .../ViaVersion/api/rewriters/BlockRewriter.java      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/api/rewriters/BlockRewriter.java b/common/src/main/java/us/myles/ViaVersion/api/rewriters/BlockRewriter.java
index e6f9cb040..0d128576c 100644
--- a/common/src/main/java/us/myles/ViaVersion/api/rewriters/BlockRewriter.java
+++ b/common/src/main/java/us/myles/ViaVersion/api/rewriters/BlockRewriter.java
@@ -31,7 +31,17 @@ public class BlockRewriter {
                 map(Type.UNSIGNED_BYTE); // Action id
                 map(Type.UNSIGNED_BYTE); // Action param
                 map(Type.VAR_INT); // Block id - /!\ NOT BLOCK STATE
-                handler(wrapper -> wrapper.set(Type.VAR_INT, 0, blockRewriter.rewrite(wrapper.get(Type.VAR_INT, 0))));
+                handler(wrapper -> {
+                    int id = wrapper.get(Type.VAR_INT, 0);
+                    int mappedId = blockRewriter.rewrite(id);
+                    if (mappedId == -1) {
+                        // Block (action) has been removed
+                        wrapper.cancel();
+                        return;
+                    }
+
+                    wrapper.set(Type.VAR_INT, 0, mappedId);
+                });
             }
         });
     }