Droog71
/
Terasology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2974 from gianluca-nitti/refactor/AbstractClient 

Small refactor in AbstractClient
develop
Tobias Nett 2017-06-14 23:52:20 +02:00 committed by GitHub
parent f706095757 25965cf202
commit b624af4b78
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/main/java/org/terasology/network/internal/AbstractClient.java
View File

@ -23,7 +23,6 @@ import org.terasology.network.Client;
import org.terasology.network.ClientComponent;
import org.terasology.network.ClientInfoComponent;
import org.terasology.network.ColorComponent;
import org.terasology.registry.CoreRegistry;
import org.terasology.rendering.nui.Color;
import java.util.HashSet;
@ -51,8 +50,8 @@ public abstract class AbstractClient implements Client {
clientEntity.destroy();
}
private EntityRef findClientEntityRef() {
for (EntityRef entityRef: CoreRegistry.get(EntityManager.class).getEntitiesWith(ClientInfoComponent.class)) {
private EntityRef findClientEntityRef(EntityManager entityManager) {
for (EntityRef entityRef: entityManager.getEntitiesWith(ClientInfoComponent.class)) {
ClientInfoComponent clientInfoComponent = entityRef.getComponent(ClientInfoComponent.class);
if (clientInfoComponent.playerId.equals(getId())) {
return entityRef;
@ -67,7 +66,7 @@ public abstract class AbstractClient implements Client {
// TODO: Send event for clientInfo creation, don't create here.
EntityRef clientInfo = findClientEntityRef();
EntityRef clientInfo = findClientEntityRef(entityManager);
if (!clientInfo.exists()) {
clientInfo = createClientInfoEntity(entityManager);
}