Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Finished fixing issues #272, #266, #261, and #255.

Browse Source
This commit is contained in:
U-YUE\Sean 2012-10-30 13:14:22 -07:00
parent ab7a83b37e
commit 9354831729
5 changed files with 66 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java
View File

@ -36,6 +36,9 @@ public class ArcheryManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.trackArrows(player)) {
return;
}
@ -63,6 +66,9 @@ public class ArcheryManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.daze(player)) {
return;
}
@ -90,6 +96,9 @@ public class ArcheryManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.archeryBonus(player)) {
return;
}

15
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java
View File

@ -31,6 +31,9 @@ public class SwordsManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.swordsBleed(player)) {
return;
}
@ -52,6 +55,12 @@ public class SwordsManager {
}
public void counterAttackChecks(LivingEntity attacker, int damage) {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.counterAttack(player)) {
return;
}
@ -75,6 +84,12 @@ public class SwordsManager {
}
public void serratedStrikes(LivingEntity target, int damage) {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.serratedStrikes(player)) {
return;
}

24
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java
View File

@ -39,6 +39,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.fastFoodService(player)) {
return;
}
@ -67,6 +70,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.sharpenedClaws(player)) {
return;
}
@ -87,6 +93,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.gore(player)) {
return;
}
@ -162,6 +171,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.beastLore(player)) {
return;
}
@ -181,6 +193,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.callOfTheWild(player)) {
return;
}
@ -216,6 +231,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.environmentallyAware(player)) {
return;
}
@ -251,6 +269,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.thickFur(player)) {
return;
}
@ -271,6 +292,9 @@ public class TamingManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.shockProof(player)) {
return;
}

12
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -30,6 +30,9 @@ public class UnarmedManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.disarm(player)) {
return;
}
@ -64,6 +67,9 @@ public class UnarmedManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.deflect(player)) {
return;
}
@ -91,6 +97,9 @@ public class UnarmedManager {
if(player == null)
return;
if(permissionsInstance == null)
return;
if (!permissionsInstance.unarmedBonus(player)) {
return;
}
@ -111,6 +120,9 @@ public class UnarmedManager {
if(defender == null)
return false;
if(permissionsInstance == null)
return false;
if (!permissionsInstance.ironGrip(defender)) {
return false;
}

6
src/main/java/com/gmail/nossr50/util/Skills.java
View File

@ -507,7 +507,13 @@ public class Skills {
* @param xp the amount of XP to gain
*/
public static void xpProcessing(Player player, PlayerProfile profile, SkillType type, int xp) {
if(player == null)
return;
if (type.getPermissions(player)) {
if(Users.getPlayer(player) == null)
return;
Users.getPlayer(player).addXP(type, xp);
xpCheckSkill(type, player, profile);
}