diff --git a/GameServer/src/org/moparscape/msc/gs/model/Player.java b/GameServer/src/org/moparscape/msc/gs/model/Player.java
index ee9823b..05afd98 100644
--- a/GameServer/src/org/moparscape/msc/gs/model/Player.java
+++ b/GameServer/src/org/moparscape/msc/gs/model/Player.java
@@ -2808,10 +2808,6 @@ public final class Player extends Mob {
 		this.menuHandler = menuHandler;
 	}
 
-	public void setMining(boolean isMining) {
-		this.isMining = isMining;
-	}
-
 	/**
 	 * Sets the mute time.
 	 * 
diff --git a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java
index e4ef0f7..de49159 100644
--- a/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java
+++ b/GameServer/src/org/moparscape/msc/gs/plugins/plugs/skills/Mining.java
@@ -157,8 +157,12 @@ public class Mining implements ObjectListener {
 							"You only succeed in scratching the rock.");
 					if (retry) {
 						world.getDelayedEventHandler().add(
+																
 								new SingleEvent(owner, 500) {
 									public void action() {
+										if(!owner.isMining() || owner.inCombat()) {
+											return;
+										}
 										owner.setSkillLoops(swings + 1);
 										handleMining(object, owner,
 												owner.getClick());