disable holy water damage when pvp is turned off

closes #1263
TeamLapen · Oct 14, 2023 · 14231d0 · 14231d0
1 parent 70f13cb
commit 14231d0
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/de/teamlapen/vampirism/items/HolyWaterSplashBottleItem.java b/src/main/java/de/teamlapen/vampirism/items/HolyWaterSplashBottleItem.java
@@ -1,6 +1,5 @@
 package de.teamlapen.vampirism.items;
 
-import de.teamlapen.vampirism.VampirismMod;
 import de.teamlapen.vampirism.entity.ThrowableItemEntity;
 import de.teamlapen.vampirism.util.DamageHandler;
 import net.minecraft.sounds.SoundEvents;
@@ -43,6 +42,9 @@ public void onImpact(@NotNull ThrowableItemEntity entity, ItemStack stack, @NotN
 
             if (!list1.isEmpty()) {
                 for (LivingEntity entitylivingbase : list1) {
+                    if (thrower instanceof Player source && entitylivingbase instanceof Player target && !source.canHarmPlayer(target)) {
+                        continue;
+                    }
                     DamageHandler.affectEntityHolyWaterSplash(entitylivingbase, getStrength(tier), entity.distanceToSqr(entitylivingbase), result.getType() == HitResult.Type.ENTITY, thrower instanceof LivingEntity ? (LivingEntity) thrower : null);
                 }
             }