diff --git a/src/main/java/cactusServer/entities/Allowed.java b/src/main/java/cactusServer/entities/Allowed.java deleted file mode 100644 index 37621e8..0000000 --- a/src/main/java/cactusServer/entities/Allowed.java +++ /dev/null @@ -1,5 +0,0 @@ -package cactusServer.entities; - -public enum Allowed { - SHOOT, KILL; -} diff --git a/src/main/java/cactusServer/entities/Area.java b/src/main/java/cactusServer/entities/Area.java index 9c74882..5050012 100644 --- a/src/main/java/cactusServer/entities/Area.java +++ b/src/main/java/cactusServer/entities/Area.java @@ -36,4 +36,8 @@ public void removePermission(Allowed allowed) { permissions.remove(allowed); } + + public static enum Allowed { + SHOOT, KILL; + } } diff --git a/src/main/java/cactusServer/entities/Instance.java b/src/main/java/cactusServer/entities/Instance.java index 3a2d9f2..a7b45d3 100644 --- a/src/main/java/cactusServer/entities/Instance.java +++ b/src/main/java/cactusServer/entities/Instance.java @@ -2,6 +2,8 @@ import java.util.HashMap; import java.util.HashSet; + +import cactusServer.entities.Area.Allowed; import cactusServer.entities.Object; import framework.model3D.Position3D; import framework.physics.AngularVelocity3D; @@ -14,6 +16,7 @@ */ public class Instance { private String name; + private State state; private HashMap areaMap = new HashMap<>(); private HashMap objMap = new HashMap<>(); @@ -21,14 +24,19 @@ * (�����͌����_�ł̉��̂���) * @param name �C���X�^���X�� */ - public Instance(String name) { + public Instance(String name, State state) { this.name = name; + this.state = state; } public String getName() { return name; } + public State getState() { + return state; + } + public HashMap getAreaMap() { return areaMap; } @@ -45,6 +53,10 @@ return objMap.get(objId); } + public void setState(State state) { + this.state = state; + } + public Area createArea(String areaId, String name, Plain[] regions, HashSet permissions) { if (areaMap.containsKey(areaId)) { return null; @@ -71,7 +83,7 @@ return objMap.remove(objId); } - public static enum InstanceState { + public static enum State { ABAILABLE, MAINTENANCE; } } diff --git a/src/main/java/cactusServer/models/Instances.java b/src/main/java/cactusServer/models/Instances.java index 46e7b67..3489f1e 100644 --- a/src/main/java/cactusServer/models/Instances.java +++ b/src/main/java/cactusServer/models/Instances.java @@ -45,7 +45,7 @@ if (instanceMap.containsKey(instanceId)) { return null; } - Instance instance = new Instance(name); + Instance instance = new Instance(name, Instance.State.ABAILABLE); instanceMap.put(instanceId, instance); return instance; }