From e895ca07ba3db376ac849a8cb63268d6be936db3 Mon Sep 17 00:00:00 2001 From: wenboqiu Date: Fri, 11 Jan 2019 08:04:26 +0800 Subject: [PATCH 1/3] fix wrong null check --- .../Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs b/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs index 6f0bcf726..46164824c 100644 --- a/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs +++ b/Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs @@ -176,7 +176,7 @@ public override bool Verify() } var replicatedEntity = go.GetComponent(); - if (go == null) + if (replicatedEntity == null) { Debug.Log(go + " has no ReplicatedEntity component"); verified = false; From 5529393f8c2063df92eb99b7b49f8cd093047b70 Mon Sep 17 00:00:00 2001 From: wenboqiu Date: Wed, 16 Jan 2019 16:32:43 +0800 Subject: [PATCH 2/3] the max index should be entries count - 1 --- Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs b/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs index c457ccc3d..aaa5c4b29 100644 --- a/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs +++ b/Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs @@ -106,7 +106,7 @@ public Character SpawnCharacter(GameWorld world, PlayerState owner, Vector3 posi { var heroTypeRegistry = resourceSystem.GetResourceRegistry(); - heroIndex = Mathf.Min(heroIndex, heroTypeRegistry.entries.Count); + heroIndex = Mathf.Min(heroIndex, heroTypeRegistry.entries.Count-1); var heroTypeAsset = heroTypeRegistry.entries[heroIndex]; var charPrefabGUID = m_settings.characterPrefab.guid; From 0c530278ecd0dc9f610597d8f46a814a19e192c0 Mon Sep 17 00:00:00 2001 From: wenboqiu Date: Wed, 23 Jan 2019 11:11:24 +0800 Subject: [PATCH 3/3] fix the null check of Entity --- .../Game/Modules/HitCollision/HitCollisionSystems.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs b/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs index d58ee1218..a922abb23 100644 --- a/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs +++ b/Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs @@ -28,11 +28,12 @@ protected override void Initialize(ref ComponentGroup group) var hitCollHistoryEntity = hitCollHistory.gameObject.GetComponent().Entity; var externalSetup = hitCollHistory.settings.collisionSetup != null; var colliderSetup = externalSetup ? hitCollHistory.settings.collisionSetup.transform : hitCollHistory.transform; + + GameDebug.Assert(hitCollHistory.hitCollisionOwner != Entity.Null,"HitCollisionHistory requires HitCollisionOwner component"); + var hitCollisionOwner = EntityManager.GetComponentObject(hitCollHistory.hitCollisionOwner); - - GameDebug.Assert(hitCollHistory.hitCollisionOwner != null,"HitCollisionHistory requires HitCollisionOwner component"); - + // Find and disable all all colliders on collisionOwner var sourceColliders = new List(); RecursiveGetCollidersInChildren(colliderSetup.transform, sourceColliders);