Renamed class to not conflict with the java.lang version.

This commit is contained in:
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
+6 -6
View File
@@ -9,8 +9,6 @@
package engine.objects;
import engine.Enum;
import engine.Enum.*;
import engine.InterestManagement.InterestManager;
import engine.InterestManagement.RealmMap;
import engine.InterestManagement.Terrain;
@@ -29,6 +27,8 @@ import engine.jobs.NoTimeJob;
import engine.math.Bounds;
import engine.math.FastMath;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -364,7 +364,7 @@ public class PlayerCharacter extends AbstractCharacter {
writer.putInt(0); // Pad
writer.putInt(playerCharacter.subRaceID);
writer.putInt(Enum.GameObjectType.Race.ordinal());
writer.putInt(mbEnums.GameObjectType.Race.ordinal());
writer.putInt(playerCharacter.subRaceID);
} else
playerCharacter.race.serializeForClientMsg(writer);
@@ -2156,14 +2156,14 @@ public class PlayerCharacter extends AbstractCharacter {
//handle rented room binds.
if (bindBuilding == null) {
bindLocation = Enum.Ruins.getRandomRuin().getLocation();
bindLocation = mbEnums.Ruins.getRandomRuin().getLocation();
return bindLocation;
}
bindLocation = BuildingManager.GetBindLocationForBuilding(bindBuilding);
if (bindLocation == null)
bindLocation = Enum.Ruins.getRandomRuin().getLocation();
bindLocation = mbEnums.Ruins.getRandomRuin().getLocation();
return bindLocation;
@@ -4030,7 +4030,7 @@ public class PlayerCharacter extends AbstractCharacter {
//assign enum values for restrictions
String race = this.race.getName().replace("-", "").replace(", Male", "").replace(", Female", "");
this.absRace = Enum.MonsterType.valueOf(race);
this.absRace = mbEnums.MonsterType.valueOf(race);
if (this.baseClass != null)
this.absBaseClass = ClassType.valueOf(this.baseClass.getName());