Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix wrong null check #43

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix wrong null check #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e895ca0
fix wrong null check
wenboqiu Jan 11, 2019
5529393
the max index should be entries count - 1
wenboqiu Jan 16, 2019
0c53027
fix the null check of Entity
wenboqiu Jan 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Scripts/Game/Modules/Character/CharacterModuleServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public Character SpawnCharacter(GameWorld world, PlayerState owner, Vector3 posi
{
var heroTypeRegistry = resourceSystem.GetResourceRegistry<HeroTypeRegistry>();

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;
Expand Down
7 changes: 4 additions & 3 deletions Assets/Scripts/Game/Modules/HitCollision/HitCollisionSystems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ protected override void Initialize(ref ComponentGroup group)
var hitCollHistoryEntity = hitCollHistory.gameObject.GetComponent<GameObjectEntity>().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<HitCollisionOwner>(hitCollHistory.hitCollisionOwner);

GameDebug.Assert(hitCollHistory.hitCollisionOwner != null,"HitCollisionHistory requires HitCollisionOwner component");


// Find and disable all all colliders on collisionOwner
var sourceColliders = new List<Collider>();
RecursiveGetCollidersInChildren(colliderSetup.transform, sourceColliders);
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Game/Modules/ReplicatedEntity/ReplicatedEntityRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public override bool Verify()
}

var replicatedEntity = go.GetComponent<ReplicatedEntity>();
if (go == null)
if (replicatedEntity == null)
{
Debug.Log(go + " has no ReplicatedEntity component");
verified = false;
Expand Down