Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 02:28:03 +01:00
Code Issues Projects Releases Wiki Activity

Fix splash potions not properly affecting the player that threw them.

Browse Source
This commit is contained in:
GJ 2013-02-18 15:09:25 -05:00
parent 083a89c1a3
commit d9aad67ca5
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,15 +108,23 @@ public class EntityListener implements Listener {
if (defender instanceof Player) { if (defender instanceof Player) {
Player defendingPlayer = (Player) defender; Player defendingPlayer = (Player) defender;
// TODO: Is this even possible?
if (!defendingPlayer.isOnline()) { if (!defendingPlayer.isOnline()) {
return; return;
} }
if (attacker instanceof Player && PartyManager.inSameParty(defendingPlayer, (Player) attacker)) { if (attacker instanceof Player) {
if (!(Permissions.friendlyFire((Player) attacker) && Permissions.friendlyFire(defendingPlayer))) { Player attackingPlayer = (Player) attacker;
event.setCancelled(true);
if (defendingPlayer == attackingPlayer) {
return; return;
} }
else if (PartyManager.inSameParty(defendingPlayer, attackingPlayer)) {
if (!(Permissions.friendlyFire(attackingPlayer) && Permissions.friendlyFire(defendingPlayer))) {
event.setCancelled(true);
return;
}
}
} }
} }

12
src/main/java/com/gmail/nossr50/skills/utilities/CombatTools.java
View File

@ -223,9 +223,7 @@ public final class CombatTools {
tamingManager.gore(event); tamingManager.gore(event);
} }
if (target != master) { startGainXp(mcMMOPlayer, target, SkillType.TAMING);
startGainXp(mcMMOPlayer, target, SkillType.TAMING);
}
} }
} }
@ -322,10 +320,8 @@ public final class CombatTools {
archeryManager.trackArrows(target); archeryManager.trackArrows(target);
} }
if (target != shooter) { archeryManager.distanceXpBonus(target);
archeryManager.distanceXpBonus(target); startGainXp(mcMMOPlayer, target, SkillType.ARCHERY);
startGainXp(mcMMOPlayer, target, SkillType.ARCHERY);
}
} }
} }
@ -402,7 +398,7 @@ public final class CombatTools {
} }
for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) { for (Entity entity : target.getNearbyEntities(2.5, 2.5, 2.5)) {
if ((entity instanceof Player && Misc.isNPCPlayer((Player) entity)) || !(entity instanceof LivingEntity) || !shouldBeAffected(attacker, entity)) { if (Misc.isNPCEntity(entity) || !(entity instanceof LivingEntity) || !shouldBeAffected(attacker, entity)) {
continue; continue;
} }