Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-30 20:48:19 +01:00
Code Issues Projects Releases Wiki Activity

Fixed AE abilities not being applied correctly

Browse Source
This commit is contained in:
bm01 2012-06-22 23:10:17 +02:00
parent e61342177d
commit 6b84d39dda
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,7 +345,7 @@ public class Combat {
break;
}
if (!shouldBeAffected(attacker, target)) {
if (!shouldBeAffected(attacker, entity)) {
continue;
}
@ -485,17 +485,17 @@ public class Combat {
*
* @param player The attacking Player
* @param livingEntity The defending LivingEntity
* @return true if the LivingEntity should be damaged, false otherwise.
* @return true if the Entity should be damaged, false otherwise.
*/
public static boolean shouldBeAffected(Player player, LivingEntity livingEntity) {
if (livingEntity instanceof Player) {
Player defender = (Player) livingEntity;
public static boolean shouldBeAffected(Player player, Entity entity) {
if (entity instanceof Player) {
Player defender = (Player) entity;
if (!defender.getWorld().getPVP()) {
return false;
}
if (defender.getName().equals(player.getName())) {
if (defender == player) {
return false;
}
@ -507,8 +507,8 @@ public class Combat {
return false;
}
}
else if (livingEntity instanceof Tameable) {
Tameable pet = (Tameable) livingEntity;
else if (entity instanceof Tameable) {
Tameable pet = (Tameable) entity;
if (pet.isTamed()) {
AnimalTamer tamer = pet.getOwner();