diff --git a/src/org/apollo/game/model/Entity.java b/src/org/apollo/game/model/Entity.java index 8aed911a..172b8fae 100644 --- a/src/org/apollo/game/model/Entity.java +++ b/src/org/apollo/game/model/Entity.java @@ -22,7 +22,7 @@ public abstract class Entity implements Serializable { DROPPED_ITEM, /** - * A temporary object. + * An object appearing in the game world. */ GAME_OBJECT, @@ -39,12 +39,7 @@ public abstract class Entity implements Serializable { /** * A projectile (e.g. an arrow). */ - PROJECTILE, - - /** - * A permanent object appearing on the map, loaded from the game resources. - */ - STATIC_OBJECT; + PROJECTILE; } /** diff --git a/src/org/apollo/game/model/obj/StaticObject.java b/src/org/apollo/game/model/obj/StaticObject.java index 35c95d64..b9ec949c 100644 --- a/src/org/apollo/game/model/obj/StaticObject.java +++ b/src/org/apollo/game/model/obj/StaticObject.java @@ -54,7 +54,7 @@ public final class StaticObject extends Entity { @Override public EntityType getEntityType() { - return EntityType.STATIC_OBJECT; + return EntityType.GAME_OBJECT; } /**