Fork: 0
nitta-lab-2018 / CactusServer

当該クラスの修正. #40

Merged y-ota merged 1 commit into nitta-lab-2018:master from nitta-lab-2018:Character5 on 31 May 2018
Patch
Unified Split
Showing 2 changed files
View
72
■■■■■
 src/main/java/cactusServer/entities/Instance.java
setName(name);
setState(state);
setStage(stageModel);
}
/**
* InstancesRestとのエラー解消用 (後で消す)
* @param name
* @param state
*/
public Instance(String name, State state) {
this.name = name;
this.state = state;
}
/**
* InstancesRestとのエラー解消用 (後で消す)
* @param name
*/
public Instance(String name) {
this.name = name;
this.state = State.AVAILABLE;
}
 
public String getName() {
return name;
}
public Set<String> getAreaIdSet() {
return areaMap.keySet();
}
@JSONHint(ignore = true)
public Area getArea(String areaId) {
return areaMap.get(areaId);
}
public Set<String> getObjIdSet() {
return objMap.keySet();
}
@JSONHint(ignore = true)
public Object getObject(String objId) {
return objMap.get(objId);
}
// @JSONHint(ignore = true)
// public List<Character> getActiveCharacters() {
// List<Character> activeCharacterList = new ArrayList<>();
// for (Map.Entry<String, Character> entry : characterMap.entrySet()) {
// Character character = entry.getValue();
// if (character.isActive()) {
// activeCharacterList.add(character);
// }
// }
// return activeCharacterList;
// }
// public List<Character> getCharacters(String accountUniqueId) {
// List<Character> accountCharacterList = new ArrayList<>();
// for (Map.Entry<String, Character> entry : characterMap.entrySet()) {
// Character character = entry.getValue();
// URI accountURI = character.getAccountURI();
// if (accountUniqueId.equals("")) {
// // if文の条件にはaccountURIに含まれるaccountIdと引数のidとの照合が入る
// accountCharacterList.add(character);
// }
// }
// return accountCharacterList;
// }
@JSONHint(ignore = true)
public List<Character> getCharacters() {
List<Character> characters = new ArrayList<>();
for (Character character : characterMap.values()) {
characters.add(character);
}
return characters;
}
 
@JSONHint(ignore = true)
public Character getCharacter(String characterId) {
return characterMap.get(characterId);
}
}
public IDAddressedEntity createCharacter(String accountURI, String name, Position3D position, Angle angle, CharacterModel model) {
String id = RandomStringGenerator.generateUniqueString(UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet());
// String characterURI = (INSTANCE_URI + "/characters/" + id);
Character character = new Character(accountURI, name, position, angle, model);
characterMap.put(id, character);
return new IDAddressedEntity(id, character);
}
View
10
■■■■■
 src/main/java/cactusServer/models/Instances.java
package cactusServer.models;
 
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
 
import org.apache.commons.lang3.RandomStringUtils;
 
public Instance getInstance(String instanceId) {
return instanceMap.get(instanceId);
}
// public List<Player> getPlayers() {
// //playerMap.values().toArray()
//// List<Player> players = new ArrayList<>();
//// for (Player player : playerMap.values().) {
//// //players.
//// }
// }
public Player getPlayer(String playerId) {
return playerMap.get(playerId);
}