فهرست منبع

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

U-YUE\Sean 12 سال پیش
والد
کامیت
9354831729

+ 9 - 0
src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java

@@ -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 - 0
src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java

@@ -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 - 0
src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java

@@ -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 - 0
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java

@@ -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 - 0
src/main/java/com/gmail/nossr50/util/Skills.java

@@ -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);
         }