disable holy water damage when pvp is turned off

close #1263
TeamLapen · Oct 11, 2023 · 8c38bb2 · 8c38bb2
1 parent c7569d2
commit 8c38bb2
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/items/HolyWaterSplashBottleItem.java b/src/main/java/de/teamlapen/vampirism/items/HolyWaterSplashBottleItem.java
@@ -1,7 +1,6 @@
 package de.teamlapen.vampirism.items;
 
 import de.teamlapen.lib.lib.util.UtilLib;
-import de.teamlapen.vampirism.VampirismMod;
 import de.teamlapen.vampirism.api.blocks.HolyWaterEffectConsumer;
 import de.teamlapen.vampirism.entity.ThrowableItemEntity;
 import de.teamlapen.vampirism.util.DamageHandler;
@@ -53,7 +52,9 @@ protected void impactEntities(@NotNull ThrowableItemEntity bottleEntity, ItemSta
 
         if (!list1.isEmpty()) {
             for (LivingEntity entity : list1) {
-                DamageHandler.affectEntityHolyWaterSplash(entity, getStrength(getVampirismTier()), bottleEntity.distanceToSqr(entity), result.getType() == HitResult.Type.ENTITY, thrower instanceof LivingEntity ? (LivingEntity) thrower : null);
+                if (thrower instanceof Player source && entity instanceof Player target && source.canHarmPlayer(target)) {
+                    DamageHandler.affectEntityHolyWaterSplash(entity, getStrength(getVampirismTier()), bottleEntity.distanceToSqr(entity), result.getType() == HitResult.Type.ENTITY, thrower instanceof LivingEntity ? (LivingEntity) thrower : null);
+                }
             }
         }
     }