Browse Source

Changes up to 0.8.4

nossr50 14 years ago
parent
commit
bf328555dd

+ 1 - 1
mcMMO/com/gmail/nossr50/mcEntityListener.java

@@ -82,7 +82,7 @@ public class mcEntityListener extends EntityListener {
         	if(e instanceof Player){
         		Player defender = (Player)e;
         		if(f instanceof Monster){
-        			mcUsers.getProfile(defender).setRecentlyHurt(60);
+        			mcUsers.getProfile(defender).setRecentlyHurt(30);
         		}
         		/*
         		 * PARRYING CHECK, CHECK TO SEE IF ITS A SUCCESSFUL PARRY OR NOT

+ 2 - 0
mcMMO/com/gmail/nossr50/mcTimer.java

@@ -18,6 +18,8 @@ public class mcTimer extends TimerTask{
 	public void run() {
 		if(thecount == 5 || thecount == 10 || thecount == 15 || thecount == 20){
 			for(Player player : plugin.getServer().getOnlinePlayers()){
+				//Add the user to the file so we don't create null exception error
+				mcUsers.addUser(player);
 		    	if(player != null &&
 		    			player.getHealth() > 0 && player.getHealth() < 20 
 		    			&& mcUsers.getProfile(player).getPowerLevel() >= 1000 

+ 1 - 1
mcMMO/com/gmail/nossr50/mcm.java

@@ -974,7 +974,7 @@ public class mcm {
 					return;
 				}
     		}
-    		mcUsers.getProfile(defender).setRecentlyHurt(60);
+    		mcUsers.getProfile(defender).setRecentlyHurt(30);
     		/*
     		 * AXE CRITICAL CHECK
     		 */

+ 1 - 1
mcMMO/plugin.yml

@@ -1,3 +1,3 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 0.8.3
+version: 0.8.4