浏览代码

Merge pull request #140 from nossr50/master

Grant 13 年之前
父节点
当前提交
e54500fa90

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/Archery.java

@@ -37,7 +37,7 @@ public class Archery
 			pluginx.misc.arrowTracker.put(x, 0);
 			pluginx.misc.arrowTracker.put(x, 0);
 			if(attacker != null)
 			if(attacker != null)
 			{
 			{
-				if( (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)) || PPa.getSkillLevel(SkillType.ARCHERY) > 1000)
+				if(PPa.getSkillLevel(SkillType.ARCHERY) > 1000 || (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)))
 				{
 				{
 					pluginx.misc.arrowTracker.put(x, 1);
 					pluginx.misc.arrowTracker.put(x, 1);
 				}
 				}
@@ -48,7 +48,7 @@ public class Archery
 			{
 			{
 				if(attacker != null)
 				if(attacker != null)
 				{
 				{
-					if( (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)) || PPa.getSkillLevel(SkillType.ARCHERY) > 1000)
+				    if(PPa.getSkillLevel(SkillType.ARCHERY) > 1000 || (Math.random() * 1000 <= PPa.getSkillLevel(SkillType.ARCHERY)))
 					{
 					{
 						pluginx.misc.arrowTracker.put(x, 1);
 						pluginx.misc.arrowTracker.put(x, 1);
 					}
 					}

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/Mining.java

@@ -170,7 +170,7 @@ public class Mining
     {
     {
     	PlayerProfile PP = Users.getProfile(player);
     	PlayerProfile PP = Users.getProfile(player);
 
 
-    	if((Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING)) || PP.getSkillLevel(SkillType.MINING) > 1000) 
+    	if(PP.getSkillLevel(SkillType.MINING) > 1000 || (Math.random() * 1000 <= PP.getSkillLevel(SkillType.MINING))) 
     	{
     	{
 	    	blockProcSimulate(block, player);
 	    	blockProcSimulate(block, player);
 			return;
 			return;

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/Repair.java

@@ -742,7 +742,7 @@ public class Repair {
 		PlayerProfile PP = Users.getProfile(player);
 		PlayerProfile PP = Users.getProfile(player);
 		if(player != null)
 		if(player != null)
 		{
 		{
-			if((Math.random() * 1000 <= PP.getSkillLevel(SkillType.REPAIR)) || PP.getSkillLevel(SkillType.REPAIR) > 1000)
+			if(PP.getSkillLevel(SkillType.REPAIR) > 1000 || (Math.random() * 1000 <= PP.getSkillLevel(SkillType.REPAIR)))
 			{
 			{
 				player.sendMessage(mcLocale.getString("Skills.FeltEasy"));
 				player.sendMessage(mcLocale.getString("Skills.FeltEasy"));
 				return true;
 				return true;

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/WoodCutting.java

@@ -49,7 +49,7 @@ public class WoodCutting
     	Material mat = Material.getMaterial(block.getTypeId());
     	Material mat = Material.getMaterial(block.getTypeId());
     	if(player != null)
     	if(player != null)
     	{
     	{
-    		if((Math.random() * 1000 <= PP.getSkillLevel(SkillType.WOODCUTTING)) || PP.getSkillLevel(SkillType.WOODCUTTING) > 1000)
+    		if(PP.getSkillLevel(SkillType.WOODCUTTING) > 1000 || (Math.random() * 1000 <= PP.getSkillLevel(SkillType.WOODCUTTING)))
     		{
     		{
     			ItemStack item = new ItemStack(mat, 1, (short) 0, type);
     			ItemStack item = new ItemStack(mat, 1, (short) 0, type);
     			m.mcDropItem(block.getLocation(), item);
     			m.mcDropItem(block.getLocation(), item);