woofmeow/netfishing
woofmeow/netfishing
1
0
Fork 0
Code Issues 34 Pull requests Projects 1 Releases 24 Packages Wiki Activity Actions

Fix fish sale rejection handling

Browse source
This commit is contained in:
Alexander Sellite 2026-07-31 08:29:09 -04:00
parent c3618fdea2
commit 093b35ba0e
2 changed files with 358 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

20
network/network_sale_service.gd
View file

@ -92,12 +92,12 @@ func request_local_sale(catch_ids: Array[StringName]) -> String:
for catch_id: StringName in catch_ids:
if _reservations != null and _reservations.is_fish_reserved(catch_id):
local_sale_finished.emit(
"", false, "Reserved in a letter.", [], 0
"", false, "Reserved in a letter.", _empty_catch_ids(), 0
)
return ""
if is_local_sale_pending():
local_sale_finished.emit(
"", false, "Selling…", [], 0
"", false, "Selling…", _empty_catch_ids(), 0
)
return ""
if not can_request_sale():
@ -105,13 +105,13 @@ func request_local_sale(catch_ids: Array[StringName]) -> String:
"",
false,
"Selling is not supported by this server.",
[],
_empty_catch_ids(),
0
)
return ""
if catch_ids.is_empty() or _inventory == null:
local_sale_finished.emit(
"", false, "Sale could not be completed.", [], 0
"", false, "Sale could not be completed.", _empty_catch_ids(), 0
)
return ""
var evidence: Array[Dictionary] = []
@ -119,7 +119,7 @@ func request_local_sale(catch_ids: Array[StringName]) -> String:
var fish_catch: FishCatch = _inventory.get_catch_by_id(catch_id)
if fish_catch == null:
local_sale_finished.emit(
"", false, "That catch is no longer available.", [], 0
"", false, "That catch is no longer available.", _empty_catch_ids(), 0
)
return ""
evidence.append(fish_catch.to_network_dict())
@ -405,7 +405,9 @@ func _apply_sale_result(data: Dictionary) -> void:
func _fail_local_apply(data: Dictionary, message: String) -> void:
_finish_local_sale(data["request_id"], false, message, [], 0)
_finish_local_sale(
data["request_id"], false, message, _empty_catch_ids(), 0
)
_acknowledge_result(data, false, message)
@ -539,10 +541,14 @@ func _on_session_state_changed(state: NetworkSession.State) -> void:
_clear_session_state()
if had_pending:
local_sale_finished.emit(
"", false, "Connection lost.", [], 0
"", false, "Connection lost.", _empty_catch_ids(), 0
)
func _empty_catch_ids() -> Array[StringName]:
return []
func _clear_session_state() -> void:
_request_ledgers.clear()
_pending_by_peer.clear()