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

fix item ID conflicts in lobbies

Browse Source
This commit is contained in:
Martin Michelsen
2023-12-28 11:29:09 -08:00
parent b6cfb5b2a2
commit 0bd3bb7b77
13 changed files with 155 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/GC-ForestGame.test.txt
+59 -59
View File
@@ -302,30 +302,30 @@ I 49108 2023-05-26 16:18:08 - [Commands] Sending to C-2 (Jess) (version=GC comma
0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
0030 | 0E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 | L -)
0040 | 2C 06 8E 03 14 02 72 06 1C 00 01 10 05 03 34 67 | , r 4g
0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | , r 4g
0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 | L
0060 | 01 00 00 00 1D 00 01 10 00 00 00 00 02 00 00 00 |
0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
0080 | 1E 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 1F 00 01 10 |
0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 | L !
00B0 | 00 00 00 00 00 00 00 00 20 00 01 10 00 00 00 00 |
00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF | D
00D0 | 00 00 00 00 21 00 01 10 00 00 00 00 01 00 05 00 | !
00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
00F0 | 22 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | " P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 23 00 01 10 | #
00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 | P
0120 | 00 01 00 00 00 00 00 00 24 00 01 10 00 00 00 00 | $
0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F | D
0140 | 00 00 00 00 25 00 01 10 00 00 00 00 01 00 00 04 | %
0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
0160 | 26 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | & D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 27 00 01 10 | '
0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 | @
0190 | 00 02 00 00 00 00 00 00 28 00 01 10 00 00 00 00 | (
0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 01 00 00 | P
01B0 | 00 00 00 00 29 00 01 10 00 00 00 00 00 00 00 00 | )
01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 00 00 00 00 |
01C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
01D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
01E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -511,30 +511,30 @@ I 49108 2023-05-26 16:18:21 - [Commands] Sending to C-2 (Jess) (version=GC comma
0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
0030 | 0E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 | L -)
0040 | 2C 06 8E 03 14 02 72 06 1C 00 01 10 05 03 34 67 | , r 4g
0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | , r 4g
0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 | L
0060 | 01 00 00 00 1D 00 01 10 00 00 00 00 02 00 00 00 |
0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
0080 | 1E 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 1F 00 01 10 |
0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 | L !
00B0 | 00 00 00 00 00 00 00 00 20 00 01 10 00 00 00 00 |
00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF | D
00D0 | 00 00 00 00 21 00 01 10 00 00 00 00 01 00 05 00 | !
00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
00F0 | 22 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | " P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 23 00 01 10 | #
00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 | P
0120 | 00 01 00 00 00 00 00 00 24 00 01 10 00 00 00 00 | $
0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F | D
0140 | 00 00 00 00 25 00 01 10 00 00 00 00 01 00 00 04 | %
0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
0160 | 26 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | & D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 27 00 01 10 | '
0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 | @
0190 | 00 02 00 00 00 00 00 00 28 00 01 10 00 00 00 00 | (
0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 01 00 00 | P
01B0 | 00 00 00 00 29 00 01 10 00 00 00 00 00 00 00 00 | )
01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 00 00 00 00 |
01C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
01D0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
01E0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
@@ -9834,63 +9834,63 @@ I 49108 2023-05-26 16:28:09 - [Commands] Sending to C-2 (Jess) (version=GC comma
0010 | 00 00 01 00 11 11 11 11 7F 00 00 01 00 00 00 00 |
0020 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
0030 | 1E 02 00 01 02 00 00 00 4C 00 00 00 02 0B 2D 29 | L -)
0040 | 2C 06 8E 03 14 02 72 06 00 00 01 00 05 03 34 67 | , r 4g
0040 | 2C 06 8E 03 14 02 72 06 00 00 01 10 05 03 34 67 | , r 4g
0050 | 02 00 00 00 4C 00 00 00 01 01 07 00 00 01 00 00 | L
0060 | 01 00 00 00 01 00 01 00 00 00 00 00 02 00 00 00 |
0060 | 01 00 00 00 01 00 01 10 00 00 00 00 02 00 00 00 |
0070 | 4C 00 00 00 01 02 07 00 00 00 04 00 02 00 00 00 | L
0080 | 02 00 01 00 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 00 |
0080 | 02 00 01 10 00 00 00 00 02 00 00 00 4C 00 00 00 | L
0090 | 00 06 02 03 00 00 02 19 03 19 00 00 03 00 01 10 |
00A0 | 00 00 00 00 02 00 00 00 4C 00 00 00 01 03 21 00 | L !
00B0 | 00 00 00 00 00 00 00 00 04 00 01 00 00 00 00 00 |
00B0 | 00 00 00 00 00 00 00 00 04 00 01 10 00 00 00 00 |
00C0 | 01 00 00 00 44 00 00 00 01 03 04 00 00 00 FF FF | D
00D0 | 00 00 00 00 05 00 01 00 00 00 00 00 01 00 05 00 |
00D0 | 00 00 00 00 05 00 01 10 00 00 00 00 01 00 05 00 |
00E0 | 44 00 00 00 01 01 03 00 00 00 00 00 00 00 00 00 | D
00F0 | 06 00 01 00 00 00 00 00 01 00 00 00 50 00 00 00 | P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 00 |
00F0 | 06 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | P
0100 | 03 00 02 00 00 01 00 00 00 00 00 00 07 00 01 10 |
0110 | 00 00 00 00 01 00 00 05 50 00 00 00 03 08 00 00 | P
0120 | 00 01 00 00 00 00 00 00 08 00 01 00 00 00 00 00 |
0120 | 00 01 00 00 00 00 00 00 08 00 01 10 00 00 00 00 |
0130 | 01 00 00 03 44 00 00 00 00 01 01 00 00 00 01 0F | D
0140 | 00 00 00 00 09 00 01 00 00 00 00 00 01 00 00 04 |
0140 | 00 00 00 00 09 00 01 10 00 00 00 00 01 00 00 04 |
0150 | 44 00 00 00 01 01 06 00 00 00 01 00 00 00 00 00 | D
0160 | 0A 00 01 00 00 00 00 00 01 00 00 02 44 00 00 00 | D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 00 |
0160 | 0A 00 01 10 00 00 00 00 01 00 00 02 44 00 00 00 | D
0170 | 00 0A 01 00 00 00 02 14 00 00 00 00 0B 00 01 10 |
0180 | 00 00 00 00 01 00 00 00 40 00 00 00 03 10 00 00 | @
0190 | 00 02 00 00 00 00 00 00 0C 00 01 00 00 00 00 00 |
0190 | 00 02 00 00 00 00 00 00 0C 00 01 10 00 00 00 00 |
01A0 | 01 00 00 01 50 00 00 00 03 01 00 00 00 0A 00 00 | P
01B0 | 00 00 00 00 0D 00 01 00 00 00 00 00 01 00 00 00 |
01B0 | 00 00 00 00 0D 00 01 10 00 00 00 00 01 00 00 00 |
01C0 | 50 00 00 00 03 06 01 00 00 02 00 00 00 00 00 00 | P
01D0 | 11 0D 01 06 00 00 00 00 01 00 00 00 50 00 00 00 | P
01E0 | 03 00 01 00 00 01 00 00 00 00 00 00 0F 0D 01 06 |
01D0 | 0E 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | P
01E0 | 03 00 01 00 00 01 00 00 00 00 00 00 0F 00 01 10 |
01F0 | 00 00 00 00 01 00 00 00 50 00 00 00 03 06 00 00 | P
0200 | 00 01 00 00 00 00 00 00 04 0D 01 06 00 00 00 00 |
0200 | 00 01 00 00 00 00 00 00 10 00 01 10 00 00 00 00 |
0210 | 01 00 00 00 50 00 00 00 03 02 00 00 00 00 00 00 | P
0220 | 00 00 00 00 35 01 01 06 00 00 00 00 01 00 00 00 | 5
0220 | 00 00 00 00 11 00 01 10 00 00 00 00 01 00 00 00 |
0230 | 44 00 00 00 00 01 00 00 00 00 00 00 00 00 00 00 | D
0240 | 33 01 01 06 00 00 00 00 01 00 00 00 44 00 00 00 | 3 D
0250 | 00 06 00 00 00 00 00 00 00 00 00 00 26 01 01 06 | &
0240 | 12 00 01 10 00 00 00 00 01 00 00 00 44 00 00 00 | D
0250 | 00 06 00 00 00 00 00 00 00 00 00 00 13 00 01 10 |
0260 | 00 00 00 00 01 00 00 00 44 00 00 00 00 01 00 00 | D
0270 | 00 00 00 00 00 00 00 00 24 01 01 06 00 00 00 00 | $
0270 | 00 00 00 00 00 00 00 00 14 00 01 10 00 00 00 00 |
0280 | 01 00 00 00 44 00 00 00 01 01 00 00 00 00 00 00 | D
0290 | 01 00 00 00 D8 0C 01 06 00 00 00 00 01 00 00 00 |
0290 | 01 00 00 00 15 00 01 10 00 00 00 00 01 00 00 00 |
02A0 | 44 00 00 00 01 01 00 00 00 00 01 00 01 00 00 00 | D
02B0 | DA 0C 01 06 00 00 00 00 01 00 00 00 50 00 00 00 | P
02C0 | 03 00 00 00 00 03 00 00 00 00 00 00 43 01 01 06 | C
02B0 | 16 00 01 10 00 00 00 00 01 00 00 00 50 00 00 00 | P
02C0 | 03 00 00 00 00 03 00 00 00 00 00 00 17 00 01 10 |
02D0 | 00 00 00 00 01 00 00 00 50 00 00 00 03 07 00 00 | P
02E0 | 00 01 00 00 00 00 00 00 F8 0C 01 06 00 00 00 00 |
02E0 | 00 01 00 00 00 00 00 00 18 00 01 10 00 00 00 00 |
02F0 | 01 00 00 00 44 00 00 00 01 01 00 00 00 00 01 00 | D
0300 | 01 00 00 00 FA 0C 01 06 00 00 00 00 01 00 00 00 |
0300 | 01 00 00 00 19 00 01 10 00 00 00 00 01 00 00 00 |
0310 | 44 00 00 00 00 0A 00 00 00 00 01 05 00 00 00 00 | D
0320 | F2 0C 01 06 00 00 00 00 01 00 00 00 44 00 00 00 | D
0330 | 00 01 00 00 00 00 00 00 00 00 00 00 DC 0C 01 06 |
0320 | 1A 00 01 10 00 00 00 00 01 00 00 00 44 00 00 00 | D
0330 | 00 01 00 00 00 00 00 00 00 00 00 00 1B 00 01 10 |
0340 | 00 00 00 00 01 00 00 00 44 00 00 00 00 0A 00 00 | D
0350 | 00 00 00 00 00 00 00 00 E2 0C 01 06 00 00 00 00 |
0350 | 00 00 00 00 00 00 00 00 1C 00 01 10 00 00 00 00 |
0360 | 01 00 00 00 44 00 00 00 00 06 00 00 00 00 00 00 | D
0370 | 00 00 00 00 02 0D 01 06 00 00 00 00 7F 00 87 00 |
0370 | 00 00 00 00 1D 00 01 10 00 00 00 00 7F 00 87 00 |
0380 | A4 00 45 00 30 00 00 01 0A 00 28 00 64 66 92 41 | E 0 ( df A
0390 | 00 00 20 41 18 00 00 00 B5 9C 00 00 E6 00 00 00 | A
03A0 | 4A 65 73 73 00 00 00 00 00 00 00 00 00 00 00 00 | Jess
03B0 | 00 00 00 00 00 00 00 00 FF FF FF FF 00 00 00 00 |
03C0 | 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |
03C0 | 00 00 00 00 00 00 00 00 00 00 00 00 56 47 29 B8 | VG)
03D0 | 05 0B 00 02 46 00 00 00 0E 00 01 00 02 00 00 00 | F
03E0 | 06 00 AD 00 15 00 FF 00 8C 11 C7 3D FA 7C 9A 35 | = | 5
03F0 | 00 00 00 00 01 06 00 00 02 00 01 00 02 01 01 00 |