Merge branch 'master' into abstraction

bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/protocol1_9to1_8/PaperPatch.java

@@ -4,6 +4,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockPlaceEvent;
 import us.myles.ViaVersion.ViaVersionPlugin;
 import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
@@ -22,7 +23,7 @@ public class PaperPatch extends ViaBukkitListener {
     If there is a better fix then we'll replace this.
      */
 
-    @EventHandler(ignoreCancelled = true)
+    @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST)
     public void onPlace(BlockPlaceEvent e) {
         if (isOnPipe(e.getPlayer())) {
             Location location = e.getPlayer().getLocation();

common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/data/MappingData.java

@@ -110,6 +110,14 @@ public class MappingData {
             if (Via.getConfig().isSnowCollisionFix()) {
                 oldToNew[1248] = 3416;
             }
+
+            // Remap infested blocks, as they are instantly breakabale in 1.13+ and can't be broken by those clients on older servers
+            oldToNew[1552] = 1; // stone
+            oldToNew[1553] = 14; // cobblestone
+            oldToNew[1554] = 3983; // stone bricks
+            oldToNew[1555] = 3984; // mossy stone bricks
+            oldToNew[1556] = 3985; // cracked stone bricks
+            oldToNew[1557] = 3986; // chiseled stone bricks
         }
 
         @Override