EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-06-27 19:24:44 +02:00
Code Issues Projects Releases Wiki Activity

Reworking of Acrobatics, plus an Acrobatics bugfix.

Browse Source
This commit is contained in:
GJ
2012-06-11 16:11:23 -04:00
parent 5bff6d63f2
commit 6ab1996440
10 changed files with 333 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,12 +29,12 @@ import com.gmail.nossr50.locale.LocaleLoader;
import com.gmail.nossr50.party.PartyManager;
import com.gmail.nossr50.runnables.BleedTimer;
import com.gmail.nossr50.runnables.GainXp;
import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
import com.gmail.nossr50.skills.combat.Archery;
import com.gmail.nossr50.skills.combat.Axes;
import com.gmail.nossr50.skills.combat.Swords;
import com.gmail.nossr50.skills.combat.Taming;
import com.gmail.nossr50.skills.combat.Unarmed;
import com.gmail.nossr50.skills.misc.Acrobatics;
public class Combat {
private static Config configInstance = Config.getInstance();
@ -205,6 +205,8 @@ public class Combat {
}
if (target instanceof Player) {
AcrobaticsManager acroManager = new AcrobaticsManager((Player) target);
if (configInstance.getSwordsPVP() && damager instanceof Player) {
Swords.counterAttackChecks(damager, (Player) target, event.getDamage());
}
@ -214,11 +216,11 @@ public class Combat {
}
if (configInstance.getAcrobaticsPVP() && damager instanceof Player) {
Acrobatics.dodgeChecks(event);
acroManager.dodgeCheck(event);
}
if (configInstance.getAcrobaticsPVE() && !(damager instanceof Player)) {
Acrobatics.dodgeChecks(event);
acroManager.dodgeCheck(event);
}
}
}
@ -459,9 +461,8 @@ public class Combat {
}
Player defender = (Player) target;
PlayerProfile PPd = Users.getProfile(defender);
if (System.currentTimeMillis() >= (PPd.getRespawnATS() * 1000) + 5000 && ((PPd.getLastLogin() + 5) * 1000) < System.currentTimeMillis() && defender.getHealth() >= 1) {
if (defender.getHealth() >= 1) {
baseXP = 20 * configInstance.getPlayerVersusPlayerXP();
}
}