incentive/psopeeps-newserv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fuzziqersoftware:master' into master

Browse Source
This commit is contained in:
Maria J. Belmonte
2023-12-23 02:34:06 +01:00
committed by GitHub
parent 143da7e5a5 23d4b7d905
commit 20ca2529ac
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReceiveSubcommands.cc
+2 -4
View File
@@ -543,6 +543,8 @@ static void on_sync_joining_player_disp_and_inventory(
case Version::GC_NTE: case Version::GC_NTE:
case Version::GC_V3: case Version::GC_V3:
case Version::GC_EP3_TRIAL_EDITION:
case Version::GC_EP3:
if (gc_cmd) { if (gc_cmd) {
transcode_inventory_items(gc_cmd); transcode_inventory_items(gc_cmd);
send_or_enqueue_joining_player_command(target, command, flag, *gc_cmd); send_or_enqueue_joining_player_command(target, command, flag, *gc_cmd);
@@ -572,10 +574,6 @@ static void on_sync_joining_player_disp_and_inventory(
} }
break; break;
case Version::GC_EP3_TRIAL_EDITION:
case Version::GC_EP3:
throw runtime_error("Episode 3 should not send 6x70 commands");
case Version::XB_V3: case Version::XB_V3:
if (xb_cmd) { if (xb_cmd) {
transcode_inventory_items(xb_cmd); transcode_inventory_items(xb_cmd);