diff --git a/src/main/java/cactusServer/entities/Character.java b/src/main/java/cactusServer/entities/Character.java index 289a173..5ddf3d4 100644 --- a/src/main/java/cactusServer/entities/Character.java +++ b/src/main/java/cactusServer/entities/Character.java @@ -4,7 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import cactusServer.models.Instances; import cactusServer.utils.RandomStringGenerator; @@ -26,14 +25,14 @@ // JSONDecode���̌Ăяo���p } - public Character(String accountURI, String name, Position3D position, Angle angle, CharacterModel model) { - setAccountURI(accountURI); - setName(name); - setPosition(position); - setAngle(angle); - setModel(model); - updateAreaURI(); - } +// public Character(String accountURI, String name, Position3D position, Angle angle, CharacterModel model) { +// setAccountURI(accountURI); +// setName(name); +// setPosition(position); +// setAngle(angle); +// setModel(model); +// updateAreaURI(); +// } public Character(String instanceId, String accountURI, String name, Position3D position, Angle angle, CharacterModel model) { @@ -42,7 +41,7 @@ setPosition(position); setAngle(angle); setModel(model); - updateAreaURI(); + initAreaURI(instanceId); } public String getAccountURI() { @@ -137,7 +136,7 @@ private void initAreaURI(String instanceId) { Instance instance = Instances.getInstance().getInstance(instanceId); - areaURI = findAreaURI(instance); + setAreaURI(findAreaURI(instance)); } private String findAreaURI(Instance instance) { @@ -149,18 +148,21 @@ return newAreaURI.append(areaURI.substring(0, subStringStartIndex)).append(areaId).toString(); } } - throw new IllegalStateException("Character is in the unknown area"); + throw new IllegalStateException("Character is in the unknown area."); } private boolean isInTheArea(Area area) { - boolean inTheArea = false; for (Plain plain : area.getRegion()) { + // ������ Plain��a,b,c,d �� Character��x,y,z ��p����, �L�����N�^�[�����ʂɂ��邩�ǂ����̔�����s�� + // double equation = (plain.getA() * position.getX()) + (plain.getB() * // position.getY()) // + (plain.getC() * position.getZ()) + plain.getD(); - // inTheArea = (equation < 0); + // if (equation > 0) { + // return false; + // } } - return inTheArea; + return true; } private void updateAreaURI() { @@ -170,12 +172,10 @@ String previousAreaId = areaURISplit[splitSize - 1]; Instance instance = Instances.getInstance().getInstance(instanceId); Area previousArea = instance.getArea(previousAreaId); - // ���݂̃L�����N�^�[�̃|�W�V�������X�V�O�ɂ����G���A���ɂ��邩�ǂ����𔻒� - if (isInTheArea(previousArea)) { - return; // �X�V�O�ɂ����G���A���ɂ���΃G���AURI��ύX����K�v�͂Ȃ� + if (!isInTheArea(previousArea)) { + // �L�����N�^�[�̃|�W�V������p���Ăǂ̃G���A���ɂ��邩�𔻒肵�ē��Y�G���A��URI�ɍX�V���� + setAreaURI(findAreaURI(instance)); } - // �L�����N�^�[�̃|�W�V������p���Ăǂ̃G���A���ɂ��邩�𔻒肵�ē��Y�G���A��URI�ɍX�V���� - areaURI = findAreaURI(instance); } public Item destroyItem(String itemId) {