FIX can't place player heads

Relluem94s · Jul 21, 2023 · 9623ddb · 9623ddb
1 parent f966499
commit 9623ddb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 3 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>de.relluem94</groupId>
   <artifactId>relluessentials</artifactId>
   <name>RelluEssentials</name>
-  <version>4.1</version>
+  <version>4.1.3</version>
   <url>https://github.com/Relluem94s/RelluEssentials</url>
   <scm>
     <connection>scm:git:git@github.com:Relluem94s/RelluEssentials.git</connection>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <groupId>de.relluem94</groupId>
     <artifactId>relluessentials</artifactId>
     <name>RelluEssentials</name>
-    <version>4.1.2</version>
+    <version>4.1.3</version>
     <url>https://github.com/Relluem94s/RelluEssentials</url>
     <properties>
         <plugin.apiVersion>1.19</plugin.apiVersion>

diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/events/BetterNPC.java
@@ -50,7 +50,7 @@ public class BetterNPC implements Listener {
     @EventHandler
     public void onNPCPlacement(PlayerInteractEvent e) {
         if (e.getHand() != null && e.getHand().equals(EquipmentSlot.HAND)) {
-            if((e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.RIGHT_CLICK_AIR) && (e.getItem() != null && new WorldSelector().almostEquals(e.getItem()))){
+            if((e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.RIGHT_CLICK_AIR) && (e.getItem() != null && new WorldSelector().equalsName(e.getItem()))){
                 Worlds.openWorldMenu(e.getPlayer());
                 e.setCancelled(true);
             }

diff --git a/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ItemHelper.java b/src/main/java/de/relluem94/minecraft/server/spigot/essentials/helpers/ItemHelper.java
@@ -220,6 +220,28 @@ public boolean equalsExact(ItemStack compare) {
         return item.hasItemMeta() && item.getItemMeta().equals(compare.getItemMeta());
     }
 
+    /**
+     *
+     * @param compare
+     * @return boolean
+     */
+    public boolean equalsName(ItemStack compare) {
+        ItemStack item = this.getCustomItem();
+        if (item == null || compare == null) {
+            return false;
+        }
+
+        if (item.getType() != compare.getType()) {
+            return false;
+        }
+
+        if (item.hasItemMeta() != compare.hasItemMeta()) {
+            return false;
+        }
+
+        return item.getItemMeta().getDisplayName().equals(compare.getItemMeta().getDisplayName()) ;
+    }
+
     /**
      *
      * @param compare