MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/City.java
+15 -15
View File
@@ -9,8 +9,6 @@
package engine.objects;
import engine.Enum;
import engine.Enum.*;
import engine.InterestManagement.RealmMap;
import engine.InterestManagement.WorldGrid;
import engine.db.archive.CityRecord;
@@ -20,6 +18,8 @@ import engine.math.Bounds;
import engine.math.FastMath;
import engine.math.Vector2f;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.*;
import engine.net.ByteBufferWriter;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -287,7 +287,7 @@ public class City extends AbstractWorldObject {
city = City.getCity(cityID);
if (city == null)
return Enum.Ruins.getRandomRuin().getLocation();
return mbEnums.Ruins.getRandomRuin().getLocation();
return city.getBindLoc();
}
@@ -301,7 +301,7 @@ public class City extends AbstractWorldObject {
Guild pcG = pc.getGuild();
ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(Enum.GameObjectType.City);
ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(mbEnums.GameObjectType.City);
//add npc cities
@@ -375,7 +375,7 @@ public class City extends AbstractWorldObject {
Guild pcG = playerCharacter.getGuild();
ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(Enum.GameObjectType.City);
ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(mbEnums.GameObjectType.City);
//add npc cities
@@ -440,7 +440,7 @@ public class City extends AbstractWorldObject {
if (cityId == 0)
return null;
City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
City city = (City) DbManager.getFromCache(mbEnums.GameObjectType.City, cityId);
if (city != null)
return city;
@@ -454,7 +454,7 @@ public class City extends AbstractWorldObject {
if (cityId == 0)
return null;
return (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
return (City) DbManager.getFromCache(mbEnums.GameObjectType.City, cityId);
}
public boolean renameCity(String cityName) {
@@ -723,7 +723,7 @@ public class City extends AbstractWorldObject {
Bounds cityBounds = Bounds.borrow();
cityBounds.setBounds(new Vector2f(this.location.x + 64, this.location.z + 64), // location x and z are offset by 64 from the center of the city.
new Vector2f(Enum.CityBoundsType.GRID.halfExtents, Enum.CityBoundsType.GRID.halfExtents),
new Vector2f(mbEnums.CityBoundsType.GRID.halfExtents, mbEnums.CityBoundsType.GRID.halfExtents),
0.0f);
this.setBounds(cityBounds);
@@ -775,12 +775,12 @@ public class City extends AbstractWorldObject {
// Add city entry to data warehouse if newly created
if ((ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) && (this.getHash() == null)) {
if ((ConfigManager.serverType.equals(mbEnums.ServerType.WORLDSERVER)) && (this.getHash() == null)) {
this.setHash();
if (DataWarehouse.recordExists(Enum.DataRecordType.CITY, this.getObjectUUID()) == false) {
CityRecord cityRecord = CityRecord.borrow(this, Enum.RecordEventType.CREATE);
if (DataWarehouse.recordExists(mbEnums.DataRecordType.CITY, this.getObjectUUID()) == false) {
CityRecord cityRecord = CityRecord.borrow(this, mbEnums.RecordEventType.CREATE);
DataWarehouse.pushToWarehouse(cityRecord);
}
}
@@ -1225,7 +1225,7 @@ public class City extends AbstractWorldObject {
}
this.setForceRename(true);
CityRecord cityRecord = CityRecord.borrow(this, Enum.RecordEventType.TRANSFER);
CityRecord cityRecord = CityRecord.borrow(this, mbEnums.RecordEventType.TRANSFER);
DataWarehouse.pushToWarehouse(cityRecord);
return true;
@@ -1258,7 +1258,7 @@ public class City extends AbstractWorldObject {
// Write hash to player character table
DataWarehouse.writeHash(Enum.DataRecordType.CITY, this.getObjectUUID());
DataWarehouse.writeHash(mbEnums.DataRecordType.CITY, this.getObjectUUID());
}
public boolean setRealmTaxDate(LocalDateTime realmTaxDate) {
@@ -1392,9 +1392,9 @@ public class City extends AbstractWorldObject {
vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().warehouse.building.getObjectUUID()));
vrm.configure();
Dispatch dispatch = Dispatch.borrow(player, vrm);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
}