Renamed class to not conflict with the java.lang version.
This commit is contained in:
@@ -9,8 +9,8 @@
|
||||
|
||||
package engine.net.client.msg;
|
||||
|
||||
import engine.Enum;
|
||||
import engine.gameManager.DbManager;
|
||||
import engine.mbEnums;
|
||||
import engine.net.AbstractConnection;
|
||||
import engine.net.ByteBufferReader;
|
||||
import engine.net.ByteBufferWriter;
|
||||
@@ -78,10 +78,10 @@ public class CityDataMsg extends ClientNetMsg {
|
||||
|
||||
|
||||
ArrayList<City> cityList = new ArrayList<>();
|
||||
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(Enum.GameObjectType.City);
|
||||
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(mbEnums.GameObjectType.City);
|
||||
for (AbstractGameObject ago : map.values())
|
||||
|
||||
if (ago.getObjectType().equals(Enum.GameObjectType.City))
|
||||
if (ago.getObjectType().equals(mbEnums.GameObjectType.City))
|
||||
cityList.add((City) ago);
|
||||
|
||||
temp.putInt(cityList.size());
|
||||
@@ -137,10 +137,10 @@ public class CityDataMsg extends ClientNetMsg {
|
||||
if (this.updateCities) {
|
||||
writer.put((byte) 0);
|
||||
ArrayList<City> cityList = new ArrayList<>();
|
||||
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(Enum.GameObjectType.City);
|
||||
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(mbEnums.GameObjectType.City);
|
||||
if (map != null) {
|
||||
for (AbstractGameObject ago : map.values())
|
||||
if (ago.getObjectType().equals(Enum.GameObjectType.City))
|
||||
if (ago.getObjectType().equals(mbEnums.GameObjectType.City))
|
||||
cityList.add((City) ago);
|
||||
|
||||
writer.putInt(cityList.size());
|
||||
|
||||
Reference in New Issue
Block a user