diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index c1f43c8..d45e75b 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -18,7 +18,7 @@ private String name; private Position3D position; private Quaternion3D angle; - private String modelID; + private int modelID; private HashMap itemMap = new HashMap<>(); @JSONHint(ignore = true) @@ -29,7 +29,7 @@ } public Character(String instanceId, String accountURI, String name, Position3D position, Quaternion3D angle, - String modelID) { + int modelID) { setAccountURI(accountURI); setName(name); setPosition(position); @@ -54,7 +54,7 @@ return angle; } - public String getModelID() { + public int getModelID() { return modelID; } @@ -88,7 +88,7 @@ this.angle = angle; } - public void setModelID(String modelID) { + public void setModelID(int modelID) { this.modelID = modelID; } @@ -146,7 +146,7 @@ setPosition(position); setQuaternion3D(angle); if (modelID != null) { - setModelID(modelID); + setModelID(Integer.parseInt(modelID)); } if (areaURI != null) { setAreaURI(areaURI); diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index add0c54..7ac0175 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -147,10 +147,10 @@ } public IDAddressedEntity createCharacter(String instanceId, String accountURI, String name, Position3D position, - Quaternion3D angle, String model) { + Quaternion3D angle, String modelID) { String id = RandomStringGenerator.generateUniqueString(Character.UNIQUE_ID_LENGTH, RandomStringGenerator.ALPHA_NUMERIC, characterMap.keySet()); - Character character = new Character(instanceId, accountURI, name, position, angle, model); + Character character = new Character(instanceId, accountURI, name, position, angle, Integer.parseInt(modelID)); characterMap.put(id, character); return new IDAddressedEntity(id, character); }