diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java index 18dfdcdd6..26b82b6ab 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java @@ -11,6 +11,8 @@ import us.myles.ViaVersion.api.Via; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.api.minecraft.item.Item; import us.myles.ViaVersion.api.platform.ViaPlatformLoader; +import us.myles.ViaVersion.api.protocol.ProtocolRegistry; +import us.myles.ViaVersion.api.protocol.ProtocolVersion; import us.myles.ViaVersion.bukkit.listeners.UpdateListener; import us.myles.ViaVersion.bukkit.listeners.protocol1_9to1_8.*; import us.myles.ViaVersion.bukkit.providers.BukkitInventoryQuickMoveProvider; @@ -68,10 +70,11 @@ public class BukkitViaLoader implements ViaPlatformLoader { storeListener(new DeathListener(plugin)).register(); storeListener(new BlockListener(plugin)).register(); - if (Bukkit.getVersion().toLowerCase().contains("paper") + if ((Bukkit.getVersion().toLowerCase().contains("paper") || Bukkit.getVersion().toLowerCase().contains("taco") - || Bukkit.getVersion().toLowerCase().contains("torch")) { - plugin.getLogger().info("Enabling PaperSpigot/TacoSpigot/Torch patch: Fixes block placement."); + || Bukkit.getVersion().toLowerCase().contains("torch")) + && ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_12.getId()) { + plugin.getLogger().info("Enabling Paper/TacoSpigot/Torch patch: Fixes block placement."); storeListener(new PaperPatch(plugin)).register(); } if (plugin.getConf().isItemCache()) { @@ -125,4 +128,4 @@ public class BukkitViaLoader implements ViaPlatformLoader { } tasks.clear(); } -} +} \ No newline at end of file