MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

PVP xp enabled

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-09-05 19:40:25 -05:00
parent 383ef27128
commit 3f8b3bc6cb
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Experience.java
+5 -5
View File
@@ -292,17 +292,17 @@ public class Experience {
switch (TargetColor.getCon(pc, mob)) { switch (TargetColor.getCon(pc, mob)) {
case Red: case Red:
return 1.25; return 1.1;
case Orange: case Orange:
return 1.15; return 1.15;
case Yellow: case Yellow:
return 1.05; return 1.2;
case Blue: case Blue:
return 1; return 1.25;
case Cyan: case Cyan:
return 0.8; return 0.9;
case Green: case Green:
return 0.5; return 0.7;
default: default:
return 0; return 0;
} }
src/engine/objects/PlayerCharacter.java
+12 -12
View File
@@ -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());