Skip to content

Commit 59ba578

Browse files
authored
Remove NMS Version Check (#124)
Removes the NmsManager checks for goPaint tool interaction Fixes the error on 1.20.5/6 servers
1 parent bd0c9f8 commit 59ba578

File tree

3 files changed

+2
-71
lines changed

3 files changed

+2
-71
lines changed

src/main/java/net/arcaniax/gopaint/GoPaintPlugin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import net.arcaniax.gopaint.listeners.ConnectListener;
2424
import net.arcaniax.gopaint.listeners.InteractListener;
2525
import net.arcaniax.gopaint.listeners.InventoryListener;
26-
import net.arcaniax.gopaint.objects.other.NmsManager;
2726
import net.arcaniax.gopaint.objects.other.Settings;
2827
import net.arcaniax.gopaint.objects.player.PlayerBrushManager;
2928
import net.arcaniax.gopaint.utils.DisabledBlocks;
@@ -40,7 +39,6 @@ public class GoPaintPlugin extends JavaPlugin implements Listener {
4039

4140
private static final int BSTATS_ID = 10557;
4241
public static boolean plotSquaredEnabled;
43-
public static NmsManager nmsManager;
4442
private static PlayerBrushManager manager;
4543
private static GoPaintPlugin goPaintPlugin;
4644
private static Settings settings;
@@ -88,7 +86,6 @@ public void onEnable() {
8886
pm.registerEvents(inventoryListener, this);
8987
pm.registerEvents(cmdHandler, this);
9088
getCommand("gopaint").setExecutor(cmdHandler);
91-
nmsManager = new NmsManager();
9289
DisabledBlocks.addBlocks();
9390
// Check if we are in a safe environment
9491
ServerLib.checkUnsafeForks();

src/main/java/net/arcaniax/gopaint/listeners/InteractListener.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import net.arcaniax.gopaint.objects.player.PlayerBrush;
2424
import net.arcaniax.gopaint.utils.XMaterial;
2525
import org.bukkit.Location;
26-
import org.bukkit.Material;
2726
import org.bukkit.entity.Player;
2827
import org.bukkit.event.EventHandler;
2928
import org.bukkit.event.EventPriority;
@@ -32,8 +31,6 @@
3231
import org.bukkit.event.player.PlayerInteractEvent;
3332
import org.bukkit.inventory.EquipmentSlot;
3433

35-
import java.util.Set;
36-
3734
public class InteractListener implements Listener {
3835

3936
public GoPaintPlugin plugin;
@@ -45,10 +42,8 @@ public InteractListener(GoPaintPlugin main) {
4542
@SuppressWarnings("deprecation")
4643
@EventHandler(priority = EventPriority.LOWEST)
4744
public void onClick(PlayerInteractEvent e) {
48-
if (GoPaintPlugin.nmsManager.isAtLeastVersion(1, 9, 0)) {
49-
if (e.getHand() == EquipmentSlot.OFF_HAND) {
50-
return;
51-
}
45+
if (e.getHand() == EquipmentSlot.OFF_HAND) {
46+
return;
5247
}
5348
if (!e.getPlayer().hasPermission("gopaint.use")) {
5449
return;

src/main/java/net/arcaniax/gopaint/objects/other/NmsManager.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)