Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix behavior check in packet_object

This commit is contained in:
MysterD 2022-06-05 00:24:48 -07:00
parent 20c972c9fa
commit 349ae6a709
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pc/network/packets/packet_object.c
View File

@ -366,10 +366,11 @@ static struct SyncObject* packet_read_object_header(struct Packet* p, u8* fromLo
packet_read(p, &behaviorId, sizeof(u32)); packet_read(p, &behaviorId, sizeof(u32));
BehaviorScript* behavior = (BehaviorScript*)get_behavior_from_id(behaviorId); BehaviorScript* behavior = (BehaviorScript*)get_behavior_from_id(behaviorId);
BehaviorScript* lBehavior = (BehaviorScript*)smlua_override_behavior(behavior);
if (behavior == NULL) { if (behavior == NULL) {
LOG_ERROR("unable to find behavior %04X for id %d", behaviorId, syncId); LOG_ERROR("unable to find behavior %04X for id %d", behaviorId, syncId);
return NULL; return NULL;
} if (o->behavior != behavior && !allowable_behavior_change(so, behavior)) { } if (o->behavior != behavior && o->behavior != lBehavior && !allowable_behavior_change(so, behavior)) {
LOG_ERROR("behavior mismatch for %d: %04X vs %04X", syncId, get_id_from_behavior(o->behavior), get_id_from_behavior(behavior)); LOG_ERROR("behavior mismatch for %d: %04X vs %04X", syncId, get_id_from_behavior(o->behavior), get_id_from_behavior(behavior));
return NULL; return NULL;
} }