Small Fixes

2020-09-12 10:36:01 +01:00
parent bfee7b00d2
commit 3ae6867146
13 changed files with 20 additions and 12 deletions
--- a/API/pom.xml
+++ b/API/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/NMS/v1_15_R1/pom.xml
+++ b/NMS/v1_15_R1/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/NMS/v1_16_R1/pom.xml
+++ b/NMS/v1_16_R1/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
+++ b/NMS/v1_16_R1/src/main/java/com/willfp/ecoenchants/v1_16_R1/Cooldown.java
@@ -1,6 +1,8 @@
 package com.willfp.ecoenchants.v1_16_R1;

 import com.willfp.ecoenchants.API.CooldownWrapper;
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.v1_16_R1.inventory.CraftItemStack;
 import org.bukkit.entity.Player;

 public class Cooldown implements CooldownWrapper {
--- a/NMS/v1_16_R2/pom.xml
+++ b/NMS/v1_16_R2/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/Plugin/pom.xml
+++ b/Plugin/pom.xml
@@ -7,7 +7,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>com.willfp.ecoenchants</groupId>
-        <version>5.0.0-beta4</version>
+        <version>5.0.0-beta5</version>
    </parent>

    <artifactId>plugin</artifactId>
--- a/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/commands/CommandEcodebug.java
@@ -3,6 +3,7 @@ package com.willfp.ecoenchants.commands;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.config.ConfigManager;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
+import com.willfp.ecoenchants.nms.Cooldown;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/DisplayPacketAdapter.java
@@ -3,7 +3,9 @@ package com.willfp.ecoenchants.display;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.wrappers.EnumWrappers;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
+import org.bukkit.Bukkit;
 import org.bukkit.inventory.MerchantRecipe;

 import java.util.Arrays;
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
@@ -133,8 +133,6 @@ public class EnchantDisplay {
        if(!EnchantmentTarget.ALL.contains(item.getType()))
            return oldItem;

-        item = revertDisplay(item);
-
        ItemMeta meta = item.getItemMeta();
        List<String> itemLore = new ArrayList<>();

@@ -142,6 +140,8 @@ public class EnchantDisplay {

        if(meta == null) return oldItem;

+        item = revertDisplay(item);
+
        if(meta.getPersistentDataContainer().has(keySkip, PersistentDataType.INTEGER))
            return oldItem;

--- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Grapple.java
@@ -5,6 +5,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks;
 import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
+import com.willfp.ecoenchants.util.VectorUtils;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -42,6 +43,9 @@ public class Grapple extends EcoEnchant {

        double baseMultiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "velocity-multiplier");
        Vector vector = player.getLocation().toVector().clone().subtract(victim.getLocation().toVector()).normalize().multiply(level * baseMultiplier);
-        victim.setVelocity(vector);
+
+        if(VectorUtils.isFinite(vector)) {
+            victim.setVelocity(vector);
+        }
    }
 }
--- a/Plugin/src/main/resources/enchants/normal/drill.yml
+++ b/Plugin/src/main/resources/enchants/normal/drill.yml
@@ -16,7 +16,9 @@ obtaining:

 general-config:
  targets:
+    - pickaxe
    - axe
+    - shovel
  grindstoneable: true
  conflicts:
    - lumberjack
--- a/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
+++ b/Plugin/src/main/resources/enchants/normal/infernaltouch.yml
@@ -17,9 +17,6 @@ obtaining:
 general-config:
  targets:
    - pickaxe
-    - axe
-    - shovel
-    - hoe
  grindstoneable: true
  conflicts:
    - silk_touch
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@

    <groupId>com.willfp.ecoenchants</groupId>
    <artifactId>parent</artifactId>
-    <version>5.0.0-beta4</version>
+    <version>5.0.0-beta5</version>
    <packaging>pom</packaging>
    <name>EcoEnchants Parent</name>