Quantcast

FIXED: Roll module sometimes not printing warning about time left.

F16Gaming (Laptop) [02-13-12 - 10:58]
FIXED: Roll module sometimes not printing warning about time left.
Filename
PlayerManager.lua
RollManager.lua
diff --git a/PlayerManager.lua b/PlayerManager.lua
index 60b7fdd..0914d27 100644
--- a/PlayerManager.lua
+++ b/PlayerManager.lua
@@ -179,7 +179,11 @@ function PM:GetOrCreatePlayer(name)
 	else
 		local player = CET:Copy(Player)
 		player.Info.Name = name
-		player.Info.Group = self.Access.Groups.User.Name
+		if player.Info.Name == UnitName("player") then
+			player.Info.Group = self.Access.Groups.Owner.Name
+		else
+			player.Info.Group = self.Access.Groups.User.Name
+		end
 		Players[player.Info.Name] = player
 		log:Normal(("Created player %q with default settings."):format(player.Info.Name))
 		return player
diff --git a/RollManager.lua b/RollManager.lua
index 338f001..ae5d131 100644
--- a/RollManager.lua
+++ b/RollManager.lua
@@ -60,6 +60,7 @@ local function RollTimerUpdate(_, elapsed)

 	RollTimer.Frame:SetScript("OnUpdate", nil)
 	RollTimer.Current = 0
+	RollTimer.LastWarning = 0

 	RM:StopRoll(true, true)
 end
@@ -120,6 +121,9 @@ function RM:SetTime(amount)
 end

 function RM:StartRoll(sender, item, time)
+	if RM.Running then
+		return false, "A roll is already in progress, wait for it to complete or use roll stop."
+	end
 	time = tonumber(time) or self.Settings.DEFAULT_TIME
 	RollTimer.Time = time
 	if not sender then