Fix meetings not working on dedicated servers

NotMyWing · Dec 6, 2020 · cf32210 · cf32210
1 parent d336ded
commit cf32210
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/gamemodes/amongus/gamemode/sv_meeting.moon b/src/gamemodes/amongus/gamemode/sv_meeting.moon
@@ -70,7 +70,7 @@ GM.Meeting_Start = (playerTable, bodyColor) =>
 				\SetEyeAngles point\GetAngles!
 
 		time = @ConVarSnapshots.VotePreTime\GetInt! + DISCUSS_SPLASH_TIME
-		@Net_BroadcastDiscuss playerTable, SysTime! + time
+		@Net_BroadcastDiscuss playerTable, CurTime! + time
 
 		-- Wait for the meeting to start.
 		timer.Create handle, time, 1, ->
@@ -161,7 +161,7 @@ GM.Meeting_End = =>
 		maxVotes = voteCount if voteCount > maxVotes
 
 	time = @ConVarSnapshots.VotePostTime\GetInt! + (math.min(8, maxVotes) * 0.5 - .1)
-	@Net_BroadcastMeetingEnd voteTable, SysTime! + time
+	@Net_BroadcastMeetingEnd voteTable, CurTime! + time
 
 	timer.Create handle, time, 1, ->
 		@Net_BroadcastEject reason, ejected

diff --git a/src/gamemodes/amongus/gamemode/vgui/vgui_meeting.moon b/src/gamemodes/amongus/gamemode/vgui/vgui_meeting.moon
@@ -220,7 +220,7 @@ meeting.OpenDiscuss = (caller, time) =>
 		@__megaphoneAnimation = @NewAnimation 2, 0, 0
 		@__kilAnimation = @NewAnimation 0.35, 0, 0
 
-	@__currentAnimation = @NewAnimation time - SysTime!, 0, 0, ->
+	@__currentAnimation = @NewAnimation math.max(0, time - CurTime!), 0, 0, ->
 			-- Un-darken all buttons.
 			for id, voteItem in pairs @__voteItems
 				voteItem\SetEnabled true
@@ -1057,7 +1057,7 @@ meeting.ApplyVote = (playerTable, remaining) =>
 -- @param results The table of results.
 meeting.End = (results = {}, time = 0) =>
 	@__currentState = STATES.proceeding
-	@__currentAnimation = @NewAnimation time - SysTime!, 0, 0
+	@__currentAnimation = @NewAnimation math.max(0, time - CurTime!) - CurTime!, 0, 0
 
 	@DisableAllButtons!
 	@PurgeConfirms!