Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 21:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14668 from SamGondelman/crashFix

Browse source 
Fix crash
This commit is contained in:
Antonina Savinova 2019-01-07 18:16:33 -08:00 committed by GitHub
commit a9bec719d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/udt/PacketHeaders.cpp
View file

@ -33,7 +33,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
case PacketType::EntityEdit: case PacketType::EntityEdit:
case PacketType::EntityData: case PacketType::EntityData:
case PacketType::EntityPhysics: case PacketType::EntityPhysics:
return static_cast<PacketVersion>(EntityVersion::FixPropertiesFromCleanup); return static_cast<PacketVersion>(EntityVersion::FixProtocolVersionBumpMismatch);
case PacketType::EntityQuery: case PacketType::EntityQuery:
return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums); return static_cast<PacketVersion>(EntityQueryPacketVersion::ConicalFrustums);
case PacketType::AvatarIdentity: case PacketType::AvatarIdentity:

3
libraries/networking/src/udt/PacketHeaders.h
View file

@ -254,7 +254,8 @@ enum class EntityVersion : PacketVersion {
GrabTraits, GrabTraits,
MorePropertiesCleanup, MorePropertiesCleanup,
FixPropertiesFromCleanup, FixPropertiesFromCleanup,
UpdatedPolyLines UpdatedPolyLines,
FixProtocolVersionBumpMismatch
}; };
enum class EntityScriptCallMethodVersion : PacketVersion { enum class EntityScriptCallMethodVersion : PacketVersion {