forked from MagicBane/Server
Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,9 +9,9 @@
|
||||
|
||||
package engine.objects;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.Enum.RaceType;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.mbEnums;
|
||||
import engine.mbEnums.RaceType;
|
||||
import engine.net.ByteBufferWriter;
|
||||
import engine.server.MBServerStatics;
|
||||
|
||||
@@ -57,7 +57,7 @@ public class Race {
|
||||
private final ArrayList<BaseClass> baseClasses;
|
||||
private final ArrayList<SkillReq> skillsGranted;
|
||||
private final ArrayList<PowerReq> powersGranted;
|
||||
private Enum.RaceType raceType;
|
||||
private mbEnums.RaceType raceType;
|
||||
private int token = 0;
|
||||
private HashSet<Integer> hairStyles;
|
||||
private HashSet<Integer> beardStyles;
|
||||
@@ -69,7 +69,7 @@ public class Race {
|
||||
public Race(ResultSet rs) throws SQLException {
|
||||
|
||||
this.raceRuneID = rs.getInt("ID");
|
||||
this.raceType = Enum.RaceType.getRaceTypebyRuneID(raceRuneID);
|
||||
this.raceType = mbEnums.RaceType.getRaceTypebyRuneID(raceRuneID);
|
||||
this.name = rs.getString("name");
|
||||
this.description = rs.getString("description");
|
||||
this.strStart = rs.getShort("strStart");
|
||||
@@ -335,7 +335,7 @@ public class Race {
|
||||
writer.putInt(0); // Pad
|
||||
writer.putInt(this.raceRuneID);
|
||||
|
||||
writer.putInt(Enum.GameObjectType.Race.ordinal());
|
||||
writer.putInt(mbEnums.GameObjectType.Race.ordinal());
|
||||
writer.putInt(raceRuneID);
|
||||
}
|
||||
|
||||
@@ -343,7 +343,7 @@ public class Race {
|
||||
return raceRuneID;
|
||||
}
|
||||
|
||||
public Enum.RaceType getRaceType() {
|
||||
public mbEnums.RaceType getRaceType() {
|
||||
return raceType;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user