From d523d56457c77df67951f74a1debd6d815a3b635 Mon Sep 17 00:00:00 2001
From: Joe0 <joe.pritzel0@gmail.com>
Date: Wed, 14 Mar 2012 15:24:32 -0500
Subject: [PATCH] Closes issue #87

---
 .../gs/phandler/client/InvActionHandler.java  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java
index f56bcf1..ebcc185 100644
--- a/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java
+++ b/GameServer/src/org/moparscape/msc/gs/phandler/client/InvActionHandler.java
@@ -56,21 +56,6 @@ public class InvActionHandler implements PacketHandler {
 				+ item.getDef().getCommand()
 				+ "] at: " + player.getX() + "/" + player.getY()));
 
-		if (item.getID() == 1263) {
-			// player.resetPath(); // This isn't how it's done in RSC
-			// player.setBusy(true); // Shouldn't be here
-			player.getActionSender()
-					.sendMessage("You rest in the sleeping bag");
-			showBubble(player, item);
-			player.getActionSender().sendEnterSleep();
-			// player.setFatigue(0);
-			// player.getActionSender().sendFatigue();
-			// player.getActionSender().sendMessage("You wake up - feeling refreshed");
-			// player.isSleeping = true;
-			// player.setBusy(false);
-			return;
-		}
-
 		if (player.isBusy()) {
 			if (player.inCombat()) {
 				player.getActionSender().sendMessage(
@@ -79,6 +64,22 @@ public class InvActionHandler implements PacketHandler {
 			return;
 		}// sip
 		player.resetAll();
+		
+		if (item.getID() == 1263) {
+			// player.resetPath(); // This isn't how it's done in RSC
+			// player.setBusy(true); // Shouldn't be here
+			player.getActionSender()
+					.sendMessage("You rest in the sleeping bag");
+			showBubble(player, item);
+			player.getActionSender().sendEnterSleep();
+			player.setSleeping(true);
+			// player.setFatigue(0);
+			// player.getActionSender().sendFatigue();
+			// player.getActionSender().sendMessage("You wake up - feeling refreshed");
+			// player.isSleeping = true;
+			// player.setBusy(false);
+			return;
+		}
 
 		if (World.getQuestManager().handleUseItem(item, player))
 			return;