Merge pull request #4 from heyxmirko/fix/interaction-listener

fix: Prevent world whitelist message when using non-heart/revive items
KartoffelChipss · May 4, 2024 · cd9960a · cd9960a
2 parents b35a5cc + 21ad0fa
commit cd9960a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.strassburger</groupId>
   <artifactId>LifeStealZ</artifactId>
   <name>LifeStealZ</name>
-  <version>1.1.8</version>
+  <version>1.1.9</version>
   <description>A LifeSteal SMP plugin providing you all the features you need!</description>
   <build>
     <resources>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.strassburger</groupId>
     <artifactId>LifeStealZ</artifactId>
-    <version>1.1.8</version>
+    <version>1.1.9</version>
     <packaging>jar</packaging>
 
     <name>LifeStealZ</name>

diff --git a/src/main/java/org/strassburger/lifestealz/listeners/InteractionListener.java b/src/main/java/org/strassburger/lifestealz/listeners/InteractionListener.java
@@ -17,12 +17,13 @@
 public class InteractionListener implements Listener {
     @EventHandler
     public void onPlayerInteraction(PlayerInteractEvent event) {
+        ItemStack item = event.getItem();
         Player player = event.getPlayer();
 
         boolean worldIsWhitelisted = LifeStealZ.getInstance().getConfig().getStringList("worlds").contains(player.getLocation().getWorld().getName());
 
         if (event.getAction().isRightClick() && event.getItem() != null) {
-            if (!worldIsWhitelisted) {
+            if (!worldIsWhitelisted && (CustomItemManager.isHeartItem(event.getItem()) || CustomItemManager.isReviveItem(event.getItem()))) {
                 player.sendMessage(MessageUtils.getAndFormatMsg(false, "messages.worldNotWhitelisted", "&cThis world is not whitelisted for LifeStealZ!"));
                 return;
             }
@@ -36,9 +37,10 @@ public void onPlayerInteraction(PlayerInteractEvent event) {
 
                 PlayerData playerData = LifeStealZ.getInstance().getPlayerDataStorage().load(player.getUniqueId());
 
-                ItemStack item = event.getItem().clone();
+                ItemStack itemClone = event.getItem().clone();
 
-                int savedHeartAmount = item.getItemMeta().getPersistentDataContainer().has(CustomItemManager.CUSTOM_HEART_VALUE_KEY, PersistentDataType.INTEGER) ? item.getItemMeta().getPersistentDataContainer().get(CustomItemManager.CUSTOM_HEART_VALUE_KEY, PersistentDataType.INTEGER) : 1;
+                Integer savedHeartAmountInteger = itemClone.getItemMeta().getPersistentDataContainer().has(CustomItemManager.CUSTOM_HEART_VALUE_KEY, PersistentDataType.INTEGER) ? itemClone.getItemMeta().getPersistentDataContainer().get(CustomItemManager.CUSTOM_HEART_VALUE_KEY, PersistentDataType.INTEGER) : 1;
+                int savedHeartAmount = savedHeartAmountInteger != null ? savedHeartAmountInteger : 1;
                 double heartsToAdd = savedHeartAmount * 2;
                 double newHearts = playerData.getMaxhp() + heartsToAdd;