diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 7a3a7e7..fa8a42c 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -13,11 +13,12 @@ public class Character extends Entity { private String accountURI; + private String areaURI; private String name; private Position3D position; private Angle angle; - private String model; - private String areaURI; + private String modelID; + private HashMap itemMap = new HashMap<>(); @JSONHint(ignore = true) public static final int UNIQUE_ID_LENGTH = 12; @@ -26,23 +27,13 @@ // JSONDecode���̌Ăяo���p } - // public Character(String accountURI, String name, Position3D position, Angle - // angle, String model) { - // setAccountURI(accountURI); - // setName(name); - // setPosition(position); - // setAngle(angle); - // setModel(model); - // updateAreaURI(); - // } - public Character(String instanceId, String accountURI, String name, Position3D position, Angle angle, - String model) { + String modelID) { setAccountURI(accountURI); setName(name); setPosition(position); setAngle(angle); - setModel(model); + setModelID(modelID); initAreaURI(instanceId); } @@ -62,8 +53,8 @@ return angle; } - public String getModel() { - return model; + public String getModelID() { + return modelID; } public String getAreaURI() { @@ -96,8 +87,8 @@ this.angle = angle; } - public void setModel(String model) { - this.model = model; + public void setModelID(String modelID) { + this.modelID = modelID; } public void setAreaURI(String areaURI) { @@ -150,11 +141,11 @@ return ""; } - public void update(Position3D position, Angle angle, String model, String areaURI) { + public void update(Position3D position, Angle angle, String modelID, String areaURI) { setPosition(position); setAngle(angle); - if (model != null) { - setModel(model); + if (modelID != null) { + setModelID(modelID); } if (areaURI != null) { setAreaURI(areaURI);