Merge pull request #39

updated to 6.9.1
This commit is contained in:
Auxilor 2021-03-05 20:07:12 +00:00 committed by GitHub
commit 893d3eefb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,6 +7,7 @@ import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import org.bukkit.entity.Arrow; import org.bukkit.entity.Arrow;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.entity.ProjectileLaunchEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -19,9 +20,6 @@ public class Marksman extends EcoEnchant {
} }
@EventHandler @EventHandler
public void onMarksmanShoot(@NotNull final ProjectileLaunchEvent event) { public void onMarksmanShoot(@NotNull final ProjectileLaunchEvent event) {
if (event.getEntityType() != EntityType.ARROW) {
return;
}
if (!(event.getEntity().getShooter() instanceof Player)) { if (!(event.getEntity().getShooter() instanceof Player)) {
return; return;
@ -37,10 +35,7 @@ public class Marksman extends EcoEnchant {
return; return;
} }
if (!(event.getEntity() instanceof Arrow)) { Projectile a = event.getEntity();
return;
}
Arrow a = (Arrow) event.getEntity();
a.setGravity(false); a.setGravity(false);
int ticks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "remove-arrow-after-ticks"); int ticks = this.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "remove-arrow-after-ticks");