Fix 1.13.x archery compat

This commit is contained in:
Shane Freeder 2020-02-04 23:36:54 +00:00
parent 4eef4a3e41
commit 11ca0d9ff1
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C

View File

@ -221,7 +221,7 @@ public final class CombatUtils {
} }
private static void processArcheryCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event, AbstractArrow arrow) { private static void processArcheryCombat(LivingEntity target, Player player, EntityDamageByEntityEvent event, Projectile arrow) {
double initialDamage = event.getDamage(); double initialDamage = event.getDamage();
McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player); McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
@ -381,7 +381,7 @@ public final class CombatUtils {
} }
} }
else if (entityType == EntityType.ARROW || entityType == EntityType.SPECTRAL_ARROW) { else if (entityType == EntityType.ARROW || entityType == EntityType.SPECTRAL_ARROW) {
AbstractArrow arrow = (AbstractArrow) damager; Projectile arrow = (Projectile) damager;
ProjectileSource projectileSource = arrow.getShooter(); ProjectileSource projectileSource = arrow.getShooter();
if (projectileSource != null && projectileSource instanceof Player && PrimarySkillType.ARCHERY.shouldProcess(target)) { if (projectileSource != null && projectileSource instanceof Player && PrimarySkillType.ARCHERY.shouldProcess(target)) {