mirror of
				https://github.com/mcMMO-Dev/mcMMO.git
				synced 2025-11-04 02:53:43 +01:00 
			
		
		
		
	0.9.21
This commit is contained in:
		@@ -1,5 +1,11 @@
 | 
				
			|||||||
Changelog:
 | 
					Changelog:
 | 
				
			||||||
#Versions without changelogs probably had very small misc fixes, like tweaks to the source code#
 | 
					#Versions without changelogs probably had very small misc fixes, like tweaks to the source code#
 | 
				
			||||||
 | 
					Version 0.9.21
 | 
				
			||||||
 | 
					/mcrefresh fixed to work properly with the new ability monitoring system
 | 
				
			||||||
 | 
					Ability lengths are now based on your skill level directly rather than a tiered system
 | 
				
			||||||
 | 
					Chimaera Wings won't trigger on things they shouldn't (Doors, Chests, ETC)
 | 
				
			||||||
 | 
					Chimaera Wings will properly tell you how long you have to wait to use it if you've been recently hurt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Version 0.9.20
 | 
					Version 0.9.20
 | 
				
			||||||
Fixed Tree Feller not checking if their cooldown was refreshed and always activating
 | 
					Fixed Tree Feller not checking if their cooldown was refreshed and always activating
 | 
				
			||||||
/stats and /whois will now show the powerlevel based on permissions
 | 
					/stats and /whois will now show the powerlevel based on permissions
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -30,22 +30,11 @@ public class mcExcavation {
 | 
				
			|||||||
    			mcUsers.getProfile(player).setShovelPreparationMode(false);
 | 
					    			mcUsers.getProfile(player).setShovelPreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
	    	int ticks = 2;
 | 
						    	int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 50)
 | 
						    	int x = mcUsers.getProfile(player).getExcavationInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
	    	if(!mcUsers.getProfile(player).getGigaDrillBreakerMode() && mcUsers.getProfile(player).getGigaDrillBreakerCooldown() == 0){
 | 
						    	if(!mcUsers.getProfile(player).getGigaDrillBreakerMode() && mcUsers.getProfile(player).getGigaDrillBreakerCooldown() == 0){
 | 
				
			||||||
	    		player.sendMessage(ChatColor.GREEN+"**GIGA DRILL BREAKER ACTIVATED**");
 | 
						    		player.sendMessage(ChatColor.GREEN+"**GIGA DRILL BREAKER ACTIVATED**");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -28,7 +28,7 @@ public class mcItem {
 | 
				
			|||||||
	public void chimaerawing(Player player){
 | 
						public void chimaerawing(Player player){
 | 
				
			||||||
		ItemStack is = player.getItemInHand();
 | 
							ItemStack is = player.getItemInHand();
 | 
				
			||||||
		Block block = player.getLocation().getBlock();
 | 
							Block block = player.getLocation().getBlock();
 | 
				
			||||||
		if(mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == 288 && mcm.getInstance().abilityBlockCheck(block)){
 | 
							if(mcPermissions.getInstance().chimaeraWing(player) && is.getTypeId() == 288){
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getRecentlyHurt() == 0 && is.getAmount() >= mcLoadProperties.feathersConsumedByChimaeraWing){
 | 
					    		if(mcUsers.getProfile(player).getRecentlyHurt() == 0 && is.getAmount() >= mcLoadProperties.feathersConsumedByChimaeraWing){
 | 
				
			||||||
    			Block derp = player.getLocation().getBlock();
 | 
					    			Block derp = player.getLocation().getBlock();
 | 
				
			||||||
    			int y = derp.getY();
 | 
					    			int y = derp.getY();
 | 
				
			||||||
@@ -67,7 +67,7 @@ public class mcItem {
 | 
				
			|||||||
    			player.sendMessage("**CHIMAERA WING**");
 | 
					    			player.sendMessage("**CHIMAERA WING**");
 | 
				
			||||||
    		} else if (mcUsers.getProfile(player).getRecentlyHurt() >= 1 && is.getAmount() >= 10) {
 | 
					    		} else if (mcUsers.getProfile(player).getRecentlyHurt() >= 1 && is.getAmount() >= 10) {
 | 
				
			||||||
    			player.sendMessage("You were injured recently and must wait to use this."
 | 
					    			player.sendMessage("You were injured recently and must wait to use this."
 | 
				
			||||||
    					+ChatColor.YELLOW+" ("+(mcUsers.getProfile(player).getRecentlyHurt() * 2)+"s)");
 | 
					    					+ChatColor.YELLOW+" ("+mcSkills.getInstance().calculateTimeLeft(player, mcUsers.getProfile(player).getRecentlyHurt(), 60)+"s)");
 | 
				
			||||||
    		} else if (is.getTypeId() == 288 && is.getAmount() <= 9){
 | 
					    		} else if (is.getTypeId() == 288 && is.getAmount() <= 9){
 | 
				
			||||||
    			player.sendMessage("You need more of that to use it");
 | 
					    			player.sendMessage("You need more of that to use it");
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -31,22 +31,11 @@ public class mcMining {
 | 
				
			|||||||
    			mcUsers.getProfile(player).setPickaxePreparationMode(false);
 | 
					    			mcUsers.getProfile(player).setPickaxePreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
	    	int ticks = 2;
 | 
						    	int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 50)
 | 
						    	int x = mcUsers.getProfile(player).getMiningInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
	    	if(!mcUsers.getProfile(player).getSuperBreakerMode() && mcUsers.getProfile(player).getSuperBreakerCooldown() == 0){
 | 
						    	if(!mcUsers.getProfile(player).getSuperBreakerMode() && mcUsers.getProfile(player).getSuperBreakerCooldown() == 0){
 | 
				
			||||||
	    		player.sendMessage(ChatColor.GREEN+"**SUPER BREAKER ACTIVATED**");
 | 
						    		player.sendMessage(ChatColor.GREEN+"**SUPER BREAKER ACTIVATED**");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -110,10 +110,13 @@ public class mcPlayerListener extends PlayerListener {
 | 
				
			|||||||
        		mcHerbalism.getInstance().stewCheck(player, player.getItemInHand());
 | 
					        		mcHerbalism.getInstance().stewCheck(player, player.getItemInHand());
 | 
				
			||||||
        	}
 | 
					        	}
 | 
				
			||||||
    	}
 | 
					    	}
 | 
				
			||||||
    	if(action == Action.RIGHT_CLICK_AIR || action == action.RIGHT_CLICK_BLOCK){
 | 
					 | 
				
			||||||
    	/*
 | 
					    	/*
 | 
				
			||||||
        	 * ITEM INTERACTIONS
 | 
					    	 * ITEM CHECKS
 | 
				
			||||||
    	 */
 | 
					    	 */
 | 
				
			||||||
 | 
					    	if(action == Action.RIGHT_CLICK_AIR)
 | 
				
			||||||
 | 
					        	mcItem.getInstance().itemChecks(player);
 | 
				
			||||||
 | 
					    	if(action == Action.RIGHT_CLICK_BLOCK){
 | 
				
			||||||
 | 
					    		if(mcm.getInstance().abilityBlockCheck(event.getClickedBlock()))
 | 
				
			||||||
    			mcItem.getInstance().itemChecks(player);
 | 
					    			mcItem.getInstance().itemChecks(player);
 | 
				
			||||||
    	}
 | 
					    	}
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -162,27 +165,27 @@ public class mcPlayerListener extends PlayerListener {
 | 
				
			|||||||
    		 * GIGA DRILL BREAKER
 | 
					    		 * GIGA DRILL BREAKER
 | 
				
			||||||
    		 */
 | 
					    		 */
 | 
				
			||||||
    		mcUsers.getProfile(player).setGigaDrillBreakerMode(false);
 | 
					    		mcUsers.getProfile(player).setGigaDrillBreakerMode(false);
 | 
				
			||||||
    		mcUsers.getProfile(player).setGigaDrillBreakerActivatedTimeStamp((long) 0);
 | 
					    		mcUsers.getProfile(player).setGigaDrillBreakerDeactivatedTimeStamp((long) 0);
 | 
				
			||||||
    		/*
 | 
					    		/*
 | 
				
			||||||
    		 * SERRATED STRIKE
 | 
					    		 * SERRATED STRIKE
 | 
				
			||||||
    		 */
 | 
					    		 */
 | 
				
			||||||
    		mcUsers.getProfile(player).setSerratedStrikesMode(false);
 | 
					    		mcUsers.getProfile(player).setSerratedStrikesMode(false);
 | 
				
			||||||
    		mcUsers.getProfile(player).setSerratedStrikesActivatedTimeStamp((long) 0);
 | 
					    		mcUsers.getProfile(player).setSerratedStrikesDeactivatedTimeStamp((long) 0);
 | 
				
			||||||
    		/*
 | 
					    		/*
 | 
				
			||||||
    		 * SUPER BREAKER
 | 
					    		 * SUPER BREAKER
 | 
				
			||||||
    		 */
 | 
					    		 */
 | 
				
			||||||
    		mcUsers.getProfile(player).setSuperBreakerMode(false);
 | 
					    		mcUsers.getProfile(player).setSuperBreakerMode(false);
 | 
				
			||||||
    		mcUsers.getProfile(player).setSuperBreakerActivatedTimeStamp((long) 0);
 | 
					    		mcUsers.getProfile(player).setSuperBreakerDeactivatedTimeStamp((long) 0);
 | 
				
			||||||
    		/*
 | 
					    		/*
 | 
				
			||||||
    		 * TREE FELLER
 | 
					    		 * TREE FELLER
 | 
				
			||||||
    		 */
 | 
					    		 */
 | 
				
			||||||
    		mcUsers.getProfile(player).setTreeFellerMode(false);
 | 
					    		mcUsers.getProfile(player).setTreeFellerMode(false);
 | 
				
			||||||
    		mcUsers.getProfile(player).setTreeFellerActivatedTimeStamp((long) 0);
 | 
					    		mcUsers.getProfile(player).setTreeFellerDeactivatedTimeStamp((long) 0);
 | 
				
			||||||
    		/*
 | 
					    		/*
 | 
				
			||||||
    		 * BERSERK
 | 
					    		 * BERSERK
 | 
				
			||||||
    		 */
 | 
					    		 */
 | 
				
			||||||
    		mcUsers.getProfile(player).setBerserkMode(false);
 | 
					    		mcUsers.getProfile(player).setBerserkMode(false);
 | 
				
			||||||
    		mcUsers.getProfile(player).setBerserkActivatedTimeStamp((long)0);
 | 
					    		mcUsers.getProfile(player).setBerserkDeactivatedTimeStamp((long)0);
 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
    		player.sendMessage(ChatColor.GREEN+"**ABILITIES REFRESHED!**");
 | 
					    		player.sendMessage(ChatColor.GREEN+"**ABILITIES REFRESHED!**");
 | 
				
			||||||
    	}
 | 
					    	}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -138,26 +138,15 @@ public class mcSkills {
 | 
				
			|||||||
    			mcUsers.getProfile(player).setSwordsPreparationMode(false);
 | 
					    			mcUsers.getProfile(player).setSwordsPreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
	    	int ticks = 2;
 | 
						    	int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 50)
 | 
						    	int x = mcUsers.getProfile(player).getSwordsInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
	    	if(!mcUsers.getProfile(player).getSerratedStrikesMode() && mcUsers.getProfile(player).getSerratedStrikesCooldown() == 0){
 | 
						    	if(!mcUsers.getProfile(player).getSerratedStrikesMode() && mcUsers.getProfile(player).getSerratedStrikesCooldown() == 0){
 | 
				
			||||||
	    		player.sendMessage(ChatColor.GREEN+"**SERRATED STRIKES ACTIVATED**");
 | 
						    		player.sendMessage(ChatColor.GREEN+"**SERRATED STRIKES ACTIVATED**");
 | 
				
			||||||
	    		mcUsers.getProfile(player).setSerratedStrikesTicks(ticks * 1000);
 | 
						    		mcUsers.getProfile(player).setSerratedStrikesTicks((ticks * 2) * 1000);
 | 
				
			||||||
	    		mcUsers.getProfile(player).setSerratedStrikesActivatedTimeStamp(System.currentTimeMillis());
 | 
						    		mcUsers.getProfile(player).setSerratedStrikesActivatedTimeStamp(System.currentTimeMillis());
 | 
				
			||||||
	    		mcUsers.getProfile(player).setSerratedStrikesMode(true);
 | 
						    		mcUsers.getProfile(player).setSerratedStrikesMode(true);
 | 
				
			||||||
	    	}
 | 
						    	}
 | 
				
			||||||
@@ -170,22 +159,11 @@ public class mcSkills {
 | 
				
			|||||||
    			mcUsers.getProfile(player).setFistsPreparationMode(false);
 | 
					    			mcUsers.getProfile(player).setFistsPreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
	    	int ticks = 2;
 | 
						    	int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 50)
 | 
						    	int x = mcUsers.getProfile(player).getUnarmedInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
	    	if(!mcUsers.getProfile(player).getBerserkMode() && cooldownOver(player, mcUsers.getProfile(player).getBerserkDeactivatedTimeStamp(), mcLoadProperties.berserkCooldown)){
 | 
						    	if(!mcUsers.getProfile(player).getBerserkMode() && cooldownOver(player, mcUsers.getProfile(player).getBerserkDeactivatedTimeStamp(), mcLoadProperties.berserkCooldown)){
 | 
				
			||||||
	    		player.sendMessage(ChatColor.GREEN+"**BERSERK ACTIVATED**");
 | 
						    		player.sendMessage(ChatColor.GREEN+"**BERSERK ACTIVATED**");
 | 
				
			||||||
@@ -205,22 +183,11 @@ public class mcSkills {
 | 
				
			|||||||
    			PP.setAxePreparationMode(false);
 | 
					    			PP.setAxePreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
    		int ticks = 2;
 | 
					    		int ticks = 2;
 | 
				
			||||||
    		if(PP.getAxesInt() >= 50)
 | 
					    		int x = mcUsers.getProfile(player).getAxesInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(PP.getAxesInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getAxesInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    		if(!PP.getSkullSplitterMode() && cooldownOver(player, PP.getSkullSplitterDeactivatedTimeStamp(), mcLoadProperties.skullSplitterCooldown)){
 | 
					    		if(!PP.getSkullSplitterMode() && cooldownOver(player, PP.getSkullSplitterDeactivatedTimeStamp(), mcLoadProperties.skullSplitterCooldown)){
 | 
				
			||||||
    			player.sendMessage(ChatColor.GREEN+"**SKULL SPLITTER ACTIVATED**");
 | 
					    			player.sendMessage(ChatColor.GREEN+"**SKULL SPLITTER ACTIVATED**");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,22 +50,11 @@ public class mcWoodCutting {
 | 
				
			|||||||
    			PP.setAxePreparationMode(false);
 | 
					    			PP.setAxePreparationMode(false);
 | 
				
			||||||
    		}
 | 
					    		}
 | 
				
			||||||
    		int ticks = 2;
 | 
					    		int ticks = 2;
 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 50)
 | 
					    		int x = mcUsers.getProfile(player).getWoodCuttingInt();
 | 
				
			||||||
    			ticks++;
 | 
					    		while(x >= 50){
 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 150)
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(PP.getWoodCuttingInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
 | 
					    		}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    		if(!PP.getTreeFellerMode() && mcSkills.getInstance().cooldownOver(player, PP.getTreeFellerDeactivatedTimeStamp(), mcLoadProperties.treeFellerCooldown)){
 | 
					    		if(!PP.getTreeFellerMode() && mcSkills.getInstance().cooldownOver(player, PP.getTreeFellerDeactivatedTimeStamp(), mcLoadProperties.treeFellerCooldown)){
 | 
				
			||||||
    			player.sendMessage(ChatColor.GREEN+"**TREE FELLING ACTIVATED**");
 | 
					    			player.sendMessage(ChatColor.GREEN+"**TREE FELLING ACTIVATED**");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -281,23 +281,11 @@ public class mcm {
 | 
				
			|||||||
			event.setCancelled(true);
 | 
								event.setCancelled(true);
 | 
				
			||||||
			float skillvalue = (float)mcUsers.getProfile(player).getWoodCuttingInt();
 | 
								float skillvalue = (float)mcUsers.getProfile(player).getWoodCuttingInt();
 | 
				
			||||||
			int ticks = 2;
 | 
								int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 50)
 | 
								int x = mcUsers.getProfile(player).getWoodCuttingInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getWoodCuttingInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
    		String percentage = String.valueOf((skillvalue / 1000) * 100);
 | 
					    		String percentage = String.valueOf((skillvalue / 1000) * 100);
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"WOODCUTTING"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"WOODCUTTING"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Chopping down trees");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Chopping down trees");
 | 
				
			||||||
@@ -365,23 +353,12 @@ public class mcm {
 | 
				
			|||||||
				percentage = "75";
 | 
									percentage = "75";
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
			int ticks = 2;
 | 
								int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 50)
 | 
								int x = mcUsers.getProfile(player).getAxesInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					    		
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getAxesInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"AXES"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"AXES"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
								player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
				
			||||||
@@ -423,23 +400,12 @@ public class mcm {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			int ticks = 2;
 | 
								int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 50)
 | 
								int x = mcUsers.getProfile(player).getSwordsInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					    		
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getSwordsInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"SWORDS"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"SWORDS"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
								player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
				
			||||||
@@ -483,23 +449,11 @@ public class mcm {
 | 
				
			|||||||
    		float skillvalue = (float)mcUsers.getProfile(player).getMiningInt();
 | 
					    		float skillvalue = (float)mcUsers.getProfile(player).getMiningInt();
 | 
				
			||||||
    		String percentage = String.valueOf((skillvalue / 1000) * 100);
 | 
					    		String percentage = String.valueOf((skillvalue / 1000) * 100);
 | 
				
			||||||
    		int ticks = 2;
 | 
					    		int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 50)
 | 
					    		int x = mcUsers.getProfile(player).getMiningInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getMiningInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
			event.setCancelled(true);
 | 
								event.setCancelled(true);
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"MINING"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"MINING"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Mining Stone & Ore");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Mining Stone & Ore");
 | 
				
			||||||
@@ -545,23 +499,11 @@ public class mcm {
 | 
				
			|||||||
			
 | 
								
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			int ticks = 2;
 | 
								int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 50)
 | 
								int x = mcUsers.getProfile(player).getUnarmedInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getUnarmedInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
    		
 | 
					    		
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"UNARMED"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"UNARMED"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Attacking Monsters");
 | 
				
			||||||
@@ -617,23 +559,11 @@ public class mcm {
 | 
				
			|||||||
    	if(split[0].equalsIgnoreCase("/excavation")){
 | 
					    	if(split[0].equalsIgnoreCase("/excavation")){
 | 
				
			||||||
			event.setCancelled(true);
 | 
								event.setCancelled(true);
 | 
				
			||||||
			int ticks = 2;
 | 
								int ticks = 2;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 50)
 | 
								int x = mcUsers.getProfile(player).getExcavationInt();
 | 
				
			||||||
 | 
					    		while(x >= 50){
 | 
				
			||||||
 | 
					    			x-=50;
 | 
				
			||||||
    			ticks++;
 | 
					    			ticks++;
 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 150)
 | 
					    		}
 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 250)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 350)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 450)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 550)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 650)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		if(mcUsers.getProfile(player).getExcavationInt() >= 750)
 | 
					 | 
				
			||||||
    			ticks++;
 | 
					 | 
				
			||||||
    		ticks = ticks * 2;
 | 
					 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"EXCAVATION"+ChatColor.RED+"[]-----");
 | 
								player.sendMessage(ChatColor.RED+"-----[]"+ChatColor.GREEN+"EXCAVATION"+ChatColor.RED+"[]-----");
 | 
				
			||||||
			player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Digging and finding treasures");
 | 
								player.sendMessage(ChatColor.DARK_GRAY+"XP GAIN: "+ChatColor.WHITE+"Digging and finding treasures");
 | 
				
			||||||
			player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
								player.sendMessage(ChatColor.RED+"---[]"+ChatColor.GREEN+"EFFECTS"+ChatColor.RED+"[]---");
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,3 @@
 | 
				
			|||||||
name: mcMMO
 | 
					name: mcMMO
 | 
				
			||||||
main: com.gmail.nossr50.mcMMO
 | 
					main: com.gmail.nossr50.mcMMO
 | 
				
			||||||
version: 0.9.20
 | 
					version: 0.9.21
 | 
				
			||||||
		Reference in New Issue
	
	Block a user