Fix fire extinguishing (only on Spigot servers)

Fixes #274

Author: kennytv

bukkit/src/main/java/nl/matsv/viabackwards/BukkitPlugin.java

@@ -11,6 +11,7 @@
 package nl.matsv.viabackwards;
 
 import nl.matsv.viabackwards.api.ViaBackwardsPlatform;
+import nl.matsv.viabackwards.listener.FireExtinguishListener;
 import nl.matsv.viabackwards.listener.LecternInteractListener;
 import org.bukkit.plugin.java.JavaPlugin;
 import us.myles.ViaVersion.api.Via;
@@ -27,8 +28,11 @@ public void onEnable() {
     }
 
     private void onServerLoaded() {
-        if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_14.getId()) {
-            BukkitViaLoader loader = (BukkitViaLoader) Via.getManager().getLoader();
+        BukkitViaLoader loader = (BukkitViaLoader) Via.getManager().getLoader();
+        if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_16.getVersion()) {
+            loader.storeListener(new FireExtinguishListener(this)).register();
+        }
+        if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_14.getVersion()) {
             loader.storeListener(new LecternInteractListener(this)).register();
         }
     }

bukkit/src/main/java/nl/matsv/viabackwards/listener/FireExtinguishListener.java

@@ -0,0 +1,36 @@
+package nl.matsv.viabackwards.listener;
+
+import nl.matsv.viabackwards.BukkitPlugin;
+import nl.matsv.viabackwards.protocol.protocol1_15_2to1_16.Protocol1_15_2To1_16;
+import org.bukkit.Material;
+import org.bukkit.block.Block;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.block.Action;
+import org.bukkit.event.player.PlayerInteractEvent;
+import us.myles.ViaVersion.bukkit.listeners.ViaBukkitListener;
+
+public class FireExtinguishListener extends ViaBukkitListener {
+
+    public FireExtinguishListener(BukkitPlugin plugin) {
+        super(plugin, Protocol1_15_2To1_16.class);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    public void onLecternInteract(PlayerInteractEvent event) {
+        if (event.getAction() != Action.LEFT_CLICK_BLOCK) return;
+
+        Block block = event.getClickedBlock();
+        if (block == null) return;
+
+        Player player = event.getPlayer();
+        if (!isOnPipe(player)) return;
+
+        Block relative = block.getRelative(event.getBlockFace());
+        if (relative.getType() == Material.FIRE) {
+            event.setCancelled(true);
+            relative.setType(Material.AIR);
+        }
+    }
+}

bukkit/src/main/java/nl/matsv/viabackwards/listener/LecternInteractListener.java

@@ -21,12 +21,12 @@ public LecternInteractListener(BukkitPlugin plugin) {
 
     @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
     public void onLecternInteract(PlayerInteractEvent event) {
-        Player player = event.getPlayer();
-        if (!isOnPipe(player)) return;
-
         Block block = event.getClickedBlock();
         if (block == null || block.getType() != Material.LECTERN) return;
 
+        Player player = event.getPlayer();
+        if (!isOnPipe(player)) return;
+
         Lectern lectern = (Lectern) block.getState();
         ItemStack book = lectern.getInventory().getItem(0);
         if (book == null) return;