diff --git a/QSB/Anglerfish/WorldObjects/QSBAngler.cs b/QSB/Anglerfish/WorldObjects/QSBAngler.cs index 7a1a1c97..ee1c58f3 100644 --- a/QSB/Anglerfish/WorldObjects/QSBAngler.cs +++ b/QSB/Anglerfish/WorldObjects/QSBAngler.cs @@ -2,7 +2,6 @@ using QSB.Anglerfish.Messages; using QSB.Anglerfish.TransformSync; using QSB.Messaging; -using QSB.Utility; using QSB.WorldSync; using UnityEngine; @@ -22,7 +21,7 @@ namespace QSB.Anglerfish.WorldObjects { if (QSBCore.IsHost) { - Object.Instantiate(QSBNetworkManager.singleton.AnglerPrefab).SpawnWithServerAuthority(); + NetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.singleton.AnglerPrefab)); } StartDelayedReady(); diff --git a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs index e34061a2..df1e53a1 100644 --- a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs +++ b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs @@ -2,7 +2,6 @@ using QSB.JellyfishSync.Messages; using QSB.JellyfishSync.TransformSync; using QSB.Messaging; -using QSB.Utility; using QSB.WorldSync; using UnityEngine; @@ -18,7 +17,7 @@ namespace QSB.JellyfishSync.WorldObjects { if (QSBCore.IsHost) { - Object.Instantiate(QSBNetworkManager.singleton.JellyfishPrefab).SpawnWithServerAuthority(); + NetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.singleton.JellyfishPrefab)); } StartDelayedReady(); diff --git a/QSB/OrbSync/WorldObjects/QSBOrb.cs b/QSB/OrbSync/WorldObjects/QSBOrb.cs index 23dc3b8b..29e52c2d 100644 --- a/QSB/OrbSync/WorldObjects/QSBOrb.cs +++ b/QSB/OrbSync/WorldObjects/QSBOrb.cs @@ -18,7 +18,7 @@ namespace QSB.OrbSync.WorldObjects { if (QSBCore.IsHost) { - Object.Instantiate(QSBNetworkManager.singleton.OrbPrefab).SpawnWithServerAuthority(); + NetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.singleton.OrbPrefab)); } StartDelayedReady(); diff --git a/QSB/Syncs/QSBNetworkTransform.cs b/QSB/Syncs/QSBNetworkTransform.cs index 2af73244..240a423e 100644 --- a/QSB/Syncs/QSBNetworkTransform.cs +++ b/QSB/Syncs/QSBNetworkTransform.cs @@ -21,13 +21,13 @@ namespace QSB.Syncs Vector3.Distance(transform.position, _prevPosition) > 1E-05f || Quaternion.Angle(transform.rotation, _prevRotation) > 1E-05f; - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { writer.Write(transform.position); writer.Write(transform.rotation); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { transform.position = reader.ReadVector3(); transform.rotation = reader.ReadQuaternion(); diff --git a/QSB/Syncs/QSBNetworkTransformChild.cs b/QSB/Syncs/QSBNetworkTransformChild.cs index c65544fc..e137ad1d 100644 --- a/QSB/Syncs/QSBNetworkTransformChild.cs +++ b/QSB/Syncs/QSBNetworkTransformChild.cs @@ -23,13 +23,13 @@ namespace QSB.Syncs Vector3.Distance(Target.localPosition, _prevPosition) > 1E-05f || Quaternion.Angle(Target.localRotation, _prevRotation) > 1E-05f; - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { writer.Write(Target.localPosition); writer.Write(Target.localRotation); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { Target.localPosition = reader.ReadVector3(); Target.localRotation = reader.ReadQuaternion(); diff --git a/QSB/Syncs/Sectored/BaseSectoredSync.cs b/QSB/Syncs/Sectored/BaseSectoredSync.cs index 4a337ade..a9b996f6 100644 --- a/QSB/Syncs/Sectored/BaseSectoredSync.cs +++ b/QSB/Syncs/Sectored/BaseSectoredSync.cs @@ -36,15 +36,15 @@ namespace QSB.Syncs.Sectored SetReferenceSector(null); } - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { - base.Serialize(writer, initialState); + base.Serialize(writer); writer.Write(_sectorId); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { - base.Deserialize(reader, initialState); + base.Deserialize(reader); _sectorId = reader.ReadInt(); } diff --git a/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs b/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs index b2e56c13..5b75fe90 100644 --- a/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs +++ b/QSB/Syncs/Sectored/Rigidbodies/SectoredRigidbodySync.cs @@ -33,16 +33,16 @@ namespace QSB.Syncs.Sectored.Rigidbodies _prevAngularVelocity = _relativeAngularVelocity; } - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { - base.Serialize(writer, initialState); + base.Serialize(writer); writer.Write(_relativeVelocity); writer.Write(_relativeAngularVelocity); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { - base.Deserialize(reader, initialState); + base.Deserialize(reader); _relativeVelocity = reader.ReadVector3(); _relativeAngularVelocity = reader.ReadVector3(); } diff --git a/QSB/Syncs/SyncBase.cs b/QSB/Syncs/SyncBase.cs index da50ea98..4bdd35ef 100644 --- a/QSB/Syncs/SyncBase.cs +++ b/QSB/Syncs/SyncBase.cs @@ -183,9 +183,9 @@ namespace QSB.Syncs private bool _shouldApply; - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { - base.Deserialize(reader, initialState); + base.Deserialize(reader); if (OnlyApplyOnDeserialize) { _shouldApply = true; diff --git a/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs b/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs index 5e9bf9d8..81514ee8 100644 --- a/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs +++ b/QSB/Syncs/Unsectored/Rigidbodies/UnsectoredRigidbodySync.cs @@ -33,16 +33,16 @@ namespace QSB.Syncs.Unsectored.Rigidbodies _prevAngularVelocity = _relativeAngularVelocity; } - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { - base.Serialize(writer, initialState); + base.Serialize(writer); writer.Write(_relativeVelocity); writer.Write(_relativeAngularVelocity); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { - base.Deserialize(reader, initialState); + base.Deserialize(reader); _relativeVelocity = reader.ReadVector3(); _relativeAngularVelocity = reader.ReadVector3(); } diff --git a/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs b/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs index f205e094..296528c3 100644 --- a/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs +++ b/QSB/Syncs/Unsectored/Transforms/UnsectoredTransformSync.cs @@ -12,16 +12,16 @@ namespace QSB.Syncs.Unsectored.Transforms protected sealed override Transform InitAttachedTransform() => hasAuthority ? InitLocalTransform() : InitRemoteTransform(); - protected override void Serialize(NetworkWriter writer, bool initialState) + protected override void Serialize(NetworkWriter writer) { - base.Serialize(writer, initialState); + base.Serialize(writer); writer.Write(transform.position); writer.Write(transform.rotation); } - protected override void Deserialize(NetworkReader reader, bool initialState) + protected override void Deserialize(NetworkReader reader) { - base.Deserialize(reader, initialState); + base.Deserialize(reader); transform.position = reader.ReadVector3(); transform.rotation = reader.ReadQuaternion(); } diff --git a/QSB/Utility/QSBNetworkBehaviour.cs b/QSB/Utility/QSBNetworkBehaviour.cs index 72f5a9ca..b4ace776 100644 --- a/QSB/Utility/QSBNetworkBehaviour.cs +++ b/QSB/Utility/QSBNetworkBehaviour.cs @@ -10,31 +10,10 @@ namespace QSB.Utility private double _lastSendTime; - public sealed override bool OnSerialize(NetworkWriter writer, bool initialState) - { - if (initialState) - { - Serialize(writer, true); - UpdatePrevData(); - return true; - } - - return false; - } - - public sealed override void OnDeserialize(NetworkReader reader, bool initialState) - { - if (initialState) - { - UpdatePrevData(); - Deserialize(reader, true); - } - } - protected abstract bool HasChanged(); protected abstract void UpdatePrevData(); - protected abstract void Serialize(NetworkWriter writer, bool initialState); - protected abstract void Deserialize(NetworkReader reader, bool initialState); + protected abstract void Serialize(NetworkWriter writer); + protected abstract void Deserialize(NetworkReader reader); protected virtual void Update() { @@ -63,7 +42,7 @@ namespace QSB.Utility } using var writer = NetworkWriterPool.GetWriter(); - Serialize(writer, false); + Serialize(writer); UpdatePrevData(); var data = writer.ToArraySegment(); @@ -94,7 +73,7 @@ namespace QSB.Utility { using var reader = NetworkReaderPool.GetReader(data); UpdatePrevData(); - Deserialize(reader, false); + Deserialize(reader); } } } diff --git a/QSB/Utility/VariableSync/BaseVariableSyncer.cs b/QSB/Utility/VariableSync/BaseVariableSyncer.cs index 140e73df..50f589c5 100644 --- a/QSB/Utility/VariableSync/BaseVariableSyncer.cs +++ b/QSB/Utility/VariableSync/BaseVariableSyncer.cs @@ -14,7 +14,7 @@ namespace QSB.Utility.VariableSync protected override bool HasChanged() => !EqualityComparer.Default.Equals(_prevValue, Value); protected override void UpdatePrevData() => _prevValue = Value; - protected override void Serialize(NetworkWriter writer, bool initialState) => writer.Write(Value); - protected override void Deserialize(NetworkReader reader, bool initialState) => Value = reader.Read(); + protected override void Serialize(NetworkWriter writer) => writer.Write(Value); + protected override void Deserialize(NetworkReader reader) => Value = reader.Read(); } }