Inlined empty getters

This commit is contained in:
2023-09-20 15:43:01 -04:00
parent bf9fdae58b
commit 46b3db033b
58 changed files with 210 additions and 284 deletions
@@ -299,8 +299,8 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
Set<Building> buildings = ZoneManager.findSmallestZone(assetManager.getLoc()).zoneBuildingSet;
Building tol = null;
if (playerZone.getPlayerCityUUID() != 0)
city = City.GetCityFromCache(playerZone.getPlayerCityUUID());
if (playerZone.playerCityID != 0)
city = City.GetCityFromCache(playerZone.playerCityID);
if (city != null)
tol = city.getTOL();
@@ -368,7 +368,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
if (zone == null)
return;
City banedCity = City.getCity(zone.getPlayerCityUUID());
City banedCity = City.getCity(zone.playerCityID);
if (banedCity == null)
return;
@@ -479,7 +479,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
if (zone == null)
writer.putString("Forlord");
else
writer.putString(zone.getName());
writer.putString(zone.zoneName);
writer.putString(building.getGuild().getName());
@@ -621,9 +621,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
} else {
writer.putInt(1); //kos on/off?
writer.putInt(3); // was 3
if (zone.getPlayerCityUUID() != 0 && asset.assetIsProtected()) {
if (zone.playerCityID != 0 && asset.assetIsProtected()) {
writer.putInt(GameObjectType.Building.ordinal());
writer.putInt(City.getCity(zone.getPlayerCityUUID()).getTOL().getObjectUUID());
writer.putInt(City.getCity(zone.playerCityID).getTOL().getObjectUUID());
} else {
writer.putInt(0);
writer.putInt(0);