EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Made 'shooterless' arrows dodgeable

Browse Source
This commit is contained in:
bm01
2012-06-22 19:39:14 +02:00
parent 3e20dc7de6
commit d51fa92b46
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gmail/nossr50/listeners/EntityListener.java
View File

@ -62,25 +62,19 @@ public class EntityListener implements Listener {
}
Entity attacker = event.getDamager();
Entity defender = event.getEntity();
if (attacker instanceof Projectile) {
attacker = ((Projectile) attacker).getShooter();
//There is no shooter when a projectile is thrown by a dispenser
if (attacker == null) {
return;
}
}
else if (attacker instanceof Tameable) {
AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
if (animalTamer instanceof Player) {
attacker = (Player) animalTamer;
if (animalTamer instanceof Entity) {
attacker = (Entity) animalTamer;
}
}
Entity defender = event.getEntity();
if (attacker instanceof Player && defender instanceof Player) {
if (PartyManager.getInstance().inSameParty((Player) defender, (Player) attacker)) {
event.setCancelled(true);

8
src/main/java/com/gmail/nossr50/util/Combat.java
View File

@ -173,8 +173,8 @@ public class Combat {
case ARROW:
LivingEntity shooter = ((Arrow) damager).getShooter();
if (shooter.getType() != EntityType.PLAYER) {
return;
if (shooter == null || shooter.getType() != EntityType.PLAYER) {
break;
}
if (targetIsPlayer || targetIsTamedPet) {
@ -191,7 +191,7 @@ public class Combat {
break;
}
if (targetIsPlayer && damager instanceof LivingEntity) {
if (targetIsPlayer) {
Player player = (Player) target;
AcrobaticsManager acroManager = new AcrobaticsManager(player);
@ -207,7 +207,7 @@ public class Combat {
}
}
else {
if (configInstance.getSwordsPVE()) {
if (configInstance.getSwordsPVE() && damager instanceof LivingEntity) {
swordsManager.counterAttackChecks((LivingEntity) damager, event.getDamage());
}