Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-12-26 20:27:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added antigrief check to aiming

Browse Source
This commit is contained in:
Auxilor 2021-04-01 15:17:50 +01:00
parent eb0b8083de
commit cafb73f2e7
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Aiming.java
View File

@ -1,6 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.special; package com.willfp.ecoenchants.enchantments.ecoenchants.special;
import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType;
@ -26,6 +27,7 @@ public class Aiming extends EcoEnchant {
"aiming", EnchantmentType.SPECIAL "aiming", EnchantmentType.SPECIAL
); );
} }
@EventHandler @EventHandler
public void aimingLaunch(@NotNull final ProjectileLaunchEvent event) { public void aimingLaunch(@NotNull final ProjectileLaunchEvent event) {
if (!(event.getEntity().getShooter() instanceof Player)) { if (!(event.getEntity().getShooter() instanceof Player)) {
@ -74,6 +76,7 @@ public class Aiming extends EcoEnchant {
.filter(entity -> entity instanceof LivingEntity) .filter(entity -> entity instanceof LivingEntity)
.filter(entity -> !entity.equals(player)) .filter(entity -> !entity.equals(player))
.filter(entity -> !(entity instanceof Enderman)) .filter(entity -> !(entity instanceof Enderman))
.filter(entity -> !AntigriefManager.canInjure(player, (LivingEntity) entity))
.filter(entity -> { .filter(entity -> {
if (entity instanceof Player) { if (entity instanceof Player) {
return ((Player) entity).getGameMode().equals(GameMode.SURVIVAL) || ((Player) entity).getGameMode().equals(GameMode.ADVENTURE); return ((Player) entity).getGameMode().equals(GameMode.SURVIVAL) || ((Player) entity).getGameMode().equals(GameMode.ADVENTURE);