From 72c4ac8453f25ea4c1ae2f16e27197e844ebd4e2 Mon Sep 17 00:00:00 2001 From: mfnalex <1122571+mfnalex@users.noreply.github.com> Date: Sat, 1 Apr 2023 17:41:47 +0200 Subject: [PATCH] 2.2.3 --- CHANGELOG.md | 5 +++++ pom.xml | 17 +++++------------ .../de/jeff_media/bettertridents/Main.java | 18 +++++++++--------- .../listeners/PortalListener.java | 2 +- .../listeners/TridentThrowListener.java | 4 ++-- .../bettertridents/tasks/WatchTrident.java | 7 ++++--- .../bettertridents/utils/EnchantmentUtils.java | 2 +- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 921f399..011b1b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.2.3 +- Minor optimizations +- Fixed loyalty tridents entering portals despite being disabled in the config +- Fixed tridents with loyalty already returning to player at Y=-60 + ## 2.1.1 - Improved void saving in 1.17+ diff --git a/pom.xml b/pom.xml index c24390a..770b4bb 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ de.jeff_media BetterTridents BetterTridents - 2.2.2 + 2.2.3 ${project.name} @@ -27,19 +27,12 @@ - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 - - ${project.name} - - org.apache.maven.plugins maven-shade-plugin 3.2.1 + true @@ -56,7 +49,7 @@ de.jeff_media.bettertridents.lib.org.codehaus - de.jeff_media.jefflib + com.jeff_media.jefflib de.jeff_media.bettertridents.jefflib @@ -127,9 +120,9 @@ provided - de.jeff_media + com.jeff_media JeffLib - 7.6.0-SNAPSHOT + 12.3.1 compile diff --git a/src/main/java/de/jeff_media/bettertridents/Main.java b/src/main/java/de/jeff_media/bettertridents/Main.java index 3636e47..226c3a8 100644 --- a/src/main/java/de/jeff_media/bettertridents/Main.java +++ b/src/main/java/de/jeff_media/bettertridents/Main.java @@ -19,7 +19,7 @@ import java.util.UUID; public class Main extends JavaPlugin { private static Main instance; - private final ArrayList tridents = new ArrayList<>(); + //private final ArrayList tridents = new ArrayList<>(); public static NamespacedKey LOYALTY_TAG; public static NamespacedKey IMPALING_TAG; public static NamespacedKey OFFHAND_TAG; @@ -56,7 +56,7 @@ public class Main extends JavaPlugin { reloadConfig(); new Config(); ConfigUpdater.updateConfig(); - UpdateChecker.init(this, "https://api.jeff-media.de/notridentvoid/latest-version.txt") + UpdateChecker.init(this, "https://api.jeff-media.com/notridentvoid/latest-version.txt") .setDonationLink("https://paypal.me/mfnalex") .setDownloadLink(92656) .setChangelogLink(92656) @@ -73,11 +73,11 @@ public class Main extends JavaPlugin { } } - public void setLoyal(Trident trident) { - tridents.add(trident.getUniqueId()); - } - - public void removeLoyal(Trident trident) { - tridents.remove(trident.getUniqueId()); - } +// public void setLoyal(Trident trident) { +// tridents.add(trident.getUniqueId()); +// } +// +// public void removeLoyal(Trident trident) { +// tridents.remove(trident.getUniqueId()); +// } } diff --git a/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java b/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java index 46f3689..48af22b 100644 --- a/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java +++ b/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java @@ -19,7 +19,7 @@ public class PortalListener implements Listener { if(!main.getConfig().getBoolean(Config.DISABLE_LOYALTY_PORTALS)) return; if(event.getEntityType() != EntityType.TRIDENT) return; Trident trident = (Trident) event.getEntity(); - if(EnchantmentUtils.getLoyalty(trident)) { + if(EnchantmentUtils.hasLoyalty(trident)) { main.debug("Prevented loyalty trident from travelling through portal"); event.setCancelled(true); } diff --git a/src/main/java/de/jeff_media/bettertridents/listeners/TridentThrowListener.java b/src/main/java/de/jeff_media/bettertridents/listeners/TridentThrowListener.java index bdd3a22..efa8a95 100644 --- a/src/main/java/de/jeff_media/bettertridents/listeners/TridentThrowListener.java +++ b/src/main/java/de/jeff_media/bettertridents/listeners/TridentThrowListener.java @@ -83,10 +83,10 @@ public class TridentThrowListener implements Listener { main.debug("Void Saving disabled"); return; } - main.setLoyal(trident); + //main.setLoyal(trident); main.debug("New task: WatchTrident"); new WatchTrident(trident).runTaskTimer(main,1,1); - Bukkit.getScheduler().runTaskLater(main,() ->main.removeLoyal(trident),1200); + //Bukkit.getScheduler().runTaskLater(main,() ->main.removeLoyal(trident),1200); } } diff --git a/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java b/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java index a0d3b9c..0cf8634 100644 --- a/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java +++ b/src/main/java/de/jeff_media/bettertridents/tasks/WatchTrident.java @@ -1,7 +1,8 @@ package de.jeff_media.bettertridents.tasks; +import com.jeff_media.jefflib.WorldUtils; import de.jeff_media.bettertridents.Main; -import de.jeff_media.jefflib.ReflUtils; +import com.jeff_media.jefflib.ReflUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Trident; @@ -42,7 +43,7 @@ public class WatchTrident extends BukkitRunnable { } catch (Exception e) { damageDealtField = null; getHandleMethod = null; - e.printStackTrace(); + //e.printStackTrace(); } if (fieldCount == 1) { @@ -78,7 +79,7 @@ public class WatchTrident extends BukkitRunnable { } private void rescue() { - if (trident.getLocation().getY() >= -60) return; + if (trident.getLocation().getY() >= WorldUtils.getWorldMinHeight(trident.getWorld()) - 20) return; try { damageDealtField.set(getHandleMethod.invoke(trident), true); } catch (Exception e) { diff --git a/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java b/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java index dc8b763..ac8e28e 100644 --- a/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java +++ b/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java @@ -34,7 +34,7 @@ public class EnchantmentUtils { trident.getPersistentDataContainer().set(Main.IMPALING_TAG, PersistentDataType.INTEGER, level); } - public static boolean getLoyalty(Trident trident) { + public static boolean hasLoyalty(Trident trident) { return trident.getItem().getEnchantments().containsKey(Enchantment.LOYALTY); }