Simplify diff in ConduitBlockEntity

Author: lynxplay

paper-server/patches/sources/net/minecraft/world/level/block/entity/ConduitBlockEntity.java.patch

@@ -43,15 +43,12 @@
          EntityReference<LivingEntity> newDestroyTarget = updateDestroyTarget(entity.destroyTarget, level, worldPosition, isActive);
          LivingEntity targetEntity = EntityReference.getLivingEntity(newDestroyTarget, level);
 -        if (targetEntity != null) {
--            level.playSound(
--                null, targetEntity.getX(), targetEntity.getY(), targetEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F
--            );
--            targetEntity.hurtServer(level, level.damageSources().magic(), 4.0F);
 +        if (damageTarget && targetEntity != null) { // CraftBukkit
 +            if (targetEntity.hurtServer(level, level.damageSources().magic().eventBlockDamager(level, worldPosition), 4.0F)) // CraftBukkit - move up
-+                level.playSound(
-+                    null, targetEntity.getX(), targetEntity.getY(), targetEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F
-+                );
+             level.playSound(
+                 null, targetEntity.getX(), targetEntity.getY(), targetEntity.getZ(), SoundEvents.CONDUIT_ATTACK_TARGET, SoundSource.BLOCKS, 1.0F, 1.0F
+             );
+-            targetEntity.hurtServer(level, level.damageSources().magic(), 4.0F);
          }
 
          if (!Objects.equals(newDestroyTarget, entity.destroyTarget)) {