EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-26 15:16:45 +01:00
Code Issues Projects Releases Wiki Activity

Improved attacker and defender's party check

Browse Source
This commit is contained in:
bm01 2012-05-08 19:39:12 +02:00
parent 946ea19371
commit 9b3838b912
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,14 @@
package com.gmail.nossr50.listeners; package com.gmail.nossr50.listeners;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.AnimalTamer;
import org.bukkit.entity.Entity; import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.entity.Projectile;
import org.bukkit.entity.TNTPrimed; import org.bukkit.entity.TNTPrimed;
import org.bukkit.entity.Tameable;
import org.bukkit.entity.Wolf; import org.bukkit.entity.Wolf;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -58,14 +61,22 @@ public class EntityListener implements Listener {
return; return;
} }
Entity defender = event.getEntity();
Entity attacker = event.getDamager(); Entity attacker = event.getDamager();
if (attacker instanceof Player && defender instanceof Player) { if (attacker instanceof Projectile) {
if (!defender.getWorld().getPVP()) { attacker = ((Projectile) attacker).getShooter();
return; }
} else if (attacker instanceof Tameable) {
AnimalTamer animalTamer = ((Tameable) attacker).getOwner();
if (animalTamer instanceof Player) {
attacker = (Player) animalTamer;
}
}
Entity defender = event.getEntity();
if (attacker instanceof Player && defender instanceof Player) {
if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) { if (Party.getInstance().inSameParty((Player)defender, (Player)attacker)) {
event.setCancelled(true); event.setCancelled(true);
return; return;

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

@ -268,9 +268,7 @@ public class Combat {
int damage = event.getDamage(); int damage = event.getDamage();
if (permInstance.archery(attacker) && damage > 0) { if (permInstance.archery(attacker) && damage > 0) {
if (permInstance.archeryBonus(attacker)) { if (permInstance.archeryBonus(attacker)) {
/*Archery needs a damage bonus to be viable in PVP*/ /*Archery needs a damage bonus to be viable in PVP*/
int skillLvl = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY); int skillLvl = Users.getProfile(attacker).getSkillLevel(SkillType.ARCHERY);
double dmgBonusPercent = ((skillLvl / 50) * 0.1D); double dmgBonusPercent = ((skillLvl / 50) * 0.1D);
@ -293,16 +291,8 @@ public class Combat {
startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx); startGainXp(attacker, PPa, target, SkillType.ARCHERY, pluginx);
if (target instanceof Player) { if (target instanceof Player) {
Player defender = (Player) target;
PlayerProfile PPd = Users.getProfile(defender);
if (PPa.inParty() && PPd.inParty() && Party.getInstance().inSameParty(defender, attacker)) {
event.setCancelled(true);
return;
}
if (permInstance.daze(attacker)) { if (permInstance.daze(attacker)) {
Archery.dazeCheck(defender, attacker); Archery.dazeCheck((Player) target, attacker);
} }
} }
} }