From f956ca0fc8d5ae9116e6732f9de6fb34292fb1b8 Mon Sep 17 00:00:00 2001 From: Christopher Bohn Date: Sun, 12 May 2024 22:48:07 -0700 Subject: [PATCH] Compile with 1.20.6 --- build.gradle.kts | 2 +- .../com/griefcraft/modules/flag/MagnetModule.java | 2 +- src/main/java/com/griefcraft/sql/PhysDB.java | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2ce3e943..54f9becd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,7 +24,7 @@ repositories { } dependencies { - compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.20.4-R0.1-SNAPSHOT") + compileOnly(group = "org.spigotmc", name = "spigot-api", version = "1.20.6-R0.1-SNAPSHOT") compileOnly(group = "com.sk89q.worldedit", name = "worldedit-core", version = "7.1.0") compileOnly(group = "com.sk89q.worldguard", name = "worldguard-bukkit", version = "7.0.0") compileOnly(group = "com.palmergames.bukkit.towny", name = "towny", version = "0.98.2.0") diff --git a/src/main/java/com/griefcraft/modules/flag/MagnetModule.java b/src/main/java/com/griefcraft/modules/flag/MagnetModule.java index ee4fad67..fd913615 100644 --- a/src/main/java/com/griefcraft/modules/flag/MagnetModule.java +++ b/src/main/java/com/griefcraft/modules/flag/MagnetModule.java @@ -235,7 +235,7 @@ public void run() { public static boolean isDisplay(Entity entity) { try { - if (entity.getType() == EntityType.DROPPED_ITEM) { + if (entity.getType() == EntityType.ITEM) { ItemMeta itemMeta = ((Item) entity).getItemStack().getItemMeta(); if (itemMeta != null && containsLocation(itemMeta.getDisplayName())) { return true; diff --git a/src/main/java/com/griefcraft/sql/PhysDB.java b/src/main/java/com/griefcraft/sql/PhysDB.java index d05b9fcd..b89bf8ab 100644 --- a/src/main/java/com/griefcraft/sql/PhysDB.java +++ b/src/main/java/com/griefcraft/sql/PhysDB.java @@ -259,17 +259,6 @@ public int getProtectionCount(String player, int blockId) { return count; } - /** - * Get the menu style for a player - * - * @param player - * @return - * @deprecated - */ - public String getMenuStyle(String player) { - return "basic"; - } - /** * Load the database and do any updating required or create the tables */