|
|
@ -1848,20 +1848,20 @@ public class PlayerCharacter extends AbstractCharacter { |
|
|
|
//see if we shold grant xp to attacker
|
|
|
|
//see if we shold grant xp to attacker
|
|
|
|
boolean doPVPEXP = false; |
|
|
|
boolean doPVPEXP = false; |
|
|
|
long lastKill = att.getLastKillOfTarget(this.getObjectUUID()); |
|
|
|
long lastKill = att.getLastKillOfTarget(this.getObjectUUID()); |
|
|
|
if ((System.currentTimeMillis() - lastKill) > MBServerStatics.PLAYER_KILL_XP_TIMER) |
|
|
|
//if ((System.currentTimeMillis() - lastKill) > MBServerStatics.PLAYER_KILL_XP_TIMER)
|
|
|
|
if (attacker.getLevel() > 39 && this.getLevel() > 39) { |
|
|
|
//if (attacker.getLevel() > 39 && this.getLevel() > 39) {
|
|
|
|
Guild aN = null; |
|
|
|
//Guild aN = null;
|
|
|
|
Guild tN = null; |
|
|
|
//Guild tN = null;
|
|
|
|
if (attacker.getGuild() != null) |
|
|
|
//if (attacker.getGuild() != null)
|
|
|
|
aN = attacker.getGuild().getNation(); |
|
|
|
// aN = attacker.getGuild().getNation();
|
|
|
|
if (this.getGuild() != null) |
|
|
|
//if (this.getGuild() != null)
|
|
|
|
tN = this.getGuild().getNation(); |
|
|
|
// tN = this.getGuild().getNation();
|
|
|
|
if (aN == null || tN == null || aN.isEmptyGuild() || Guild.sameGuild(aN, tN) || this.isDeathShroud()) { |
|
|
|
//if (aN == null || tN == null || aN.isEmptyGuild() || Guild.sameGuild(aN, tN) || this.isDeathShroud()) {
|
|
|
|
//skip giving xp if same guild or attacker is errant, or target is in death shroud.
|
|
|
|
//skip giving xp if same guild or attacker is errant, or target is in death shroud.
|
|
|
|
} else { |
|
|
|
//} else {
|
|
|
|
doPVPEXP = true; |
|
|
|
doPVPEXP = true; |
|
|
|
} |
|
|
|
//}
|
|
|
|
} |
|
|
|
// }
|
|
|
|
//apply death shroud to non safeholds.
|
|
|
|
//apply death shroud to non safeholds.
|
|
|
|
Zone zone = ZoneManager.findSmallestZone(this.getLoc()); |
|
|
|
Zone zone = ZoneManager.findSmallestZone(this.getLoc()); |
|
|
|
|
|
|
|
|
|
|
|