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

Fixed issue with Disarm never working.

Browse Source
This commit is contained in:
GJ 2012-03-27 14:48:36 -04:00
parent ac384c5d95
commit f19b8a88d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/Combat.java
View File

@ -100,7 +100,7 @@ public class Combat {
} }
if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) { if (targetType.equals(EntityType.PLAYER) && mcPermissions.getInstance().disarm(attacker)) {
Unarmed.disarmProcCheck(PPa, (Player) target); Unarmed.disarmProcCheck(attacker, (Player) target);
} }
startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin); startGainXp(attacker, PPa, target, SkillType.UNARMED, plugin);

6
src/main/java/com/gmail/nossr50/skills/Unarmed.java
View File

@ -43,13 +43,13 @@ public class Unarmed {
* @param PPa Profile of the attacking player * @param PPa Profile of the attacking player
* @param defender The defending player * @param defender The defending player
*/ */
public static void disarmProcCheck(PlayerProfile PPa, Player defender) { public static void disarmProcCheck(Player attacker, Player defender) {
final int MAX_BONUS_LEVEL = 1000; final int MAX_BONUS_LEVEL = 1000;
int skillLevel = PPa.getSkillLevel(SkillType.UNARMED); int skillLevel = Users.getProfile(attacker).getSkillLevel(SkillType.UNARMED);
int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL); int skillCheck = m.skillCheck(skillLevel, MAX_BONUS_LEVEL);
if (defender.getItemInHand().getType().equals(Material.AIR)) { if (attacker.getItemInHand().equals(Material.AIR)) {
if (random.nextInt(3000) <= skillCheck) { if (random.nextInt(3000) <= skillCheck) {
ItemStack item = defender.getItemInHand(); ItemStack item = defender.getItemInHand();