fix: Always clear RewindableAction queue after loop (#527)

Fixes #517

Author: elementbound

addons/netfox.extras/plugin.cfg

@@ -3,5 +3,5 @@
 name="netfox.extras"
 description="Game-specific utilities for Netfox"
 author="Tamas Galffy and contributors"
-version="1.34.0"
+version="1.34.1"
 script="netfox-extras.gd"

addons/netfox.internals/plugin.cfg

@@ -3,5 +3,5 @@
 name="netfox.internals"
 description="Shared internals for netfox addons"
 author="Tamas Galffy and contributors"
-version="1.34.0"
+version="1.34.1"
 script="plugin.gd"

addons/netfox.noray/plugin.cfg

@@ -3,5 +3,5 @@
 name="netfox.noray"
 description="Bulletproof your connectivity with noray integration for netfox"
 author="Tamas Galffy and contributors"
-version="1.34.0"
+version="1.34.1"
 script="netfox-noray.gd"

addons/netfox/plugin.cfg

@@ -3,5 +3,5 @@
 name="netfox"
 description="Shared internals for netfox addons"
 author="Tamas Galffy and contributors"
-version="1.34.0"
+version="1.34.1"
 script="netfox.gd"

addons/netfox/rewindable-action.gd

@@ -138,12 +138,11 @@ func dont_mutate(target: Object) -> void:
 
 func _connect_signals() -> void:
 	NetworkRollback.before_loop.connect(_before_rollback_loop)
-	NetworkRollback.on_process_tick.connect(_process_tick)
-	NetworkTime.after_tick_loop.connect(_after_tick_loop)
+	NetworkRollback.after_loop.connect(_after_loop)
 
 func _disconnect_signals() -> void:
 	NetworkRollback.before_loop.disconnect(_before_rollback_loop)
-	NetworkTime.after_tick_loop.disconnect(_after_tick_loop)
+	NetworkRollback.after_loop.disconnect(_after_loop)
 
 func _enter_tree() -> void:
 	_connect_signals()
@@ -170,11 +169,11 @@ func _before_rollback_loop() -> void:
 		for mutated in _mutated_objects:
 			NetworkRollback.mutate(mutated, earliest_change)
 
-func _process_tick(tick: int) -> void:
-	if _queued_changes.has(tick):
-		set_active(_queued_changes[tick])
+		# Apply queue
+		for tick in _queued_changes:
+			set_active(_queued_changes[tick], tick)
 
-func _after_tick_loop() -> void:
+func _after_loop() -> void:
 	# Trim history
 	for tick in _active_ticks:
 		if tick < NetworkRollback.history_start:
@@ -221,6 +220,9 @@ func _submit_state(bytes: PackedByteArray) -> void:
 	# Don't compare past last event, as to not cancel events the host simply doesn't know about
 	var latest_tick = maxi(last_known_tick, NetworkRollback.history_start)
 
+	if earliest_tick > NetworkTime.tick or latest_tick > NetworkTime.tick:
+		_logger.warning("Received tickset for range @%d>%d, which has ticks in the future!", [earliest_tick, latest_tick])
+
 	for tick in range(earliest_tick, latest_tick + 1):
 		var is_tick_active = active_ticks.has(tick)
 		if is_tick_active != is_active(tick):

test/netfox/rewindable-action.test.gd

@@ -0,0 +1,34 @@
+extends VestTest
+
+func get_suite_name():
+	return "RewindableAction"
+
+var rewindable_action: RewindableAction
+
+func before_case(__) -> void:
+	rewindable_action = RewindableAction.new()
+	# TODO(vest): Some good way to add nodes to the tree
+	await NetworkTime.get_tree().process_frame
+	NetworkTime.get_tree().root.add_child(rewindable_action)
+
+func after_case(__) -> void:
+	rewindable_action.free()
+
+func test_should_empty_queue_after_loop():
+	# Run as client
+	rewindable_action.set_multiplayer_authority(2)
+
+	# Prepare changes
+	var tickset := _Set.of([0])
+	var data := _TicksetSerializer.serialize(0, 4, tickset)
+	NetworkMocks.set_tick(4, 4)
+
+	# Run first loop
+	rewindable_action._submit_state(data)	# Server sends data
+	NetworkMocks.run_network_tick_loop()
+	expect(rewindable_action.has_confirmed(), "RewindableAction was not confirmed!")
+
+	# Run second loop
+	rewindable_action._submit_state(data)	# Server sends data again
+	NetworkMocks.run_network_tick_loop()
+	expect_not(rewindable_action.has_confirmed(), "RewindableAction was redundantly confirmed!")

test/netfox/rewindable-action.test.gd.uid

@@ -0,0 +1 @@
+uid://bjj3hqe3obauq