From bf328555dd1c8a2ee5a834fc4383781d45715208 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Sat, 26 Feb 2011 14:16:33 -0800
Subject: [PATCH] Changes up to 0.8.4

---
 mcMMO/com/gmail/nossr50/mcEntityListener.java | 2 +-
 mcMMO/com/gmail/nossr50/mcTimer.java          | 2 ++
 mcMMO/com/gmail/nossr50/mcm.java              | 2 +-
 mcMMO/plugin.yml                              | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mcMMO/com/gmail/nossr50/mcEntityListener.java b/mcMMO/com/gmail/nossr50/mcEntityListener.java
index aefb9b7c3..eb79a5121 100644
--- a/mcMMO/com/gmail/nossr50/mcEntityListener.java
+++ b/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
diff --git a/mcMMO/com/gmail/nossr50/mcTimer.java b/mcMMO/com/gmail/nossr50/mcTimer.java
index d7ad120bc..0cab3d457 100644
--- a/mcMMO/com/gmail/nossr50/mcTimer.java
+++ b/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 
diff --git a/mcMMO/com/gmail/nossr50/mcm.java b/mcMMO/com/gmail/nossr50/mcm.java
index ea8facbd3..ddd301bac 100644
--- a/mcMMO/com/gmail/nossr50/mcm.java
+++ b/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
     		 */
diff --git a/mcMMO/plugin.yml b/mcMMO/plugin.yml
index 2a6a9c8f9..1e3f4dba0 100644
--- a/mcMMO/plugin.yml
+++ b/mcMMO/plugin.yml
@@ -1,3 +1,3 @@
 name: mcMMO
 main: com.gmail.nossr50.mcMMO
-version: 0.8.3
\ No newline at end of file
+version: 0.8.4
\ No newline at end of file