forked from MagicBane/Server
Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,8 +9,6 @@
|
||||
|
||||
package engine.objects;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.Enum.*;
|
||||
import engine.InterestManagement.InterestManager;
|
||||
import engine.InterestManagement.Terrain;
|
||||
import engine.InterestManagement.WorldGrid;
|
||||
@@ -25,6 +23,8 @@ import engine.jobs.TrackJob;
|
||||
import engine.math.AtomicFloat;
|
||||
import engine.math.Bounds;
|
||||
import engine.math.Vector3fImmutable;
|
||||
import engine.mbEnums;
|
||||
import engine.mbEnums.*;
|
||||
import engine.net.ByteBufferWriter;
|
||||
import engine.net.Dispatch;
|
||||
import engine.net.DispatchMessage;
|
||||
@@ -130,10 +130,10 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
public ArrayList<CharacterRune> runes;
|
||||
|
||||
|
||||
public Enum.MonsterType absRace;
|
||||
public mbEnums.MonsterType absRace;
|
||||
public ClassType absBaseClass = null;
|
||||
public ClassType absPromotionClass = null;
|
||||
public Enum.SexType absGender = null;
|
||||
public mbEnums.SexType absGender = null;
|
||||
public EnumSet<DisciplineType> absDisciplines;
|
||||
|
||||
// Modifiers
|
||||
@@ -355,7 +355,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
|
||||
|
||||
this.bindLoc = new Vector3fImmutable(rs.getFloat("spawnX"), rs.getFloat("spawnY"), rs.getFloat("spawnZ"));
|
||||
|
||||
if (ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER))
|
||||
if (ConfigManager.serverType.equals(mbEnums.ServerType.WORLDSERVER))
|
||||
this.setLoc(this.bindLoc);
|
||||
this.endLoc = Vector3fImmutable.ZERO;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user