Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -243,12 +243,22 @@ namespace MegaKoop.Game.Networking
|
|||||||
CharacterTransformMessage transformMessage = CharacterTransformMessage.Deserialize(message.Payload);
|
CharacterTransformMessage transformMessage = CharacterTransformMessage.Deserialize(message.Payload);
|
||||||
if (identity != null && transformMessage.NetworkId != identity.NetworkId)
|
if (identity != null && transformMessage.NetworkId != identity.NetworkId)
|
||||||
{
|
{
|
||||||
if (ownerSteamId == 0 || message.Sender != ownerSteamId)
|
if (ownerSteamId != 0 && message.Sender != ownerSteamId)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var existing = NetworkIdRegistry.GetById(transformMessage.NetworkId);
|
||||||
|
if (existing != null && existing != identity)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
identity.SetNetworkId(transformMessage.NetworkId);
|
identity.SetNetworkId(transformMessage.NetworkId);
|
||||||
|
if (identity.NetworkId != transformMessage.NetworkId)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
remoteTargetPosition = transformMessage.Position;
|
remoteTargetPosition = transformMessage.Position;
|
||||||
|
|||||||
Reference in New Issue
Block a user