fixed login bug
This commit is contained in:
@@ -11,10 +11,7 @@ package engine.db.handlers;
|
|||||||
|
|
||||||
import engine.Enum;
|
import engine.Enum;
|
||||||
import engine.gameManager.DbManager;
|
import engine.gameManager.DbManager;
|
||||||
import engine.objects.AbstractGameObject;
|
import engine.objects.*;
|
||||||
import engine.objects.Building;
|
|
||||||
import engine.objects.City;
|
|
||||||
import engine.objects.Zone;
|
|
||||||
import org.pmw.tinylog.Logger;
|
import org.pmw.tinylog.Logger;
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.*;
|
||||||
@@ -98,19 +95,9 @@ public class dbCityHandler extends dbHandlerBase {
|
|||||||
public Integer GET_CAPITAL_CITY_COUNT() {
|
public Integer GET_CAPITAL_CITY_COUNT() {
|
||||||
|
|
||||||
int cityCount = 0;
|
int cityCount = 0;
|
||||||
try (Connection connection = DbManager.getConnection();
|
for(Realm realm : Realm._realms.values()){
|
||||||
PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM obj_city;")) {
|
if(realm.isRuled())
|
||||||
|
cityCount ++;
|
||||||
ResultSet rs = preparedStatement.executeQuery();
|
|
||||||
|
|
||||||
while(rs.next()){
|
|
||||||
if(rs.getInt("isNpc") == 0)
|
|
||||||
if(DbManager.BuildingQueries.GET_BUILDINGBYUUID(rs.getInt("treeOfLifeUUID")).getRank() == 8)
|
|
||||||
cityCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (SQLException e) {
|
|
||||||
Logger.error(e);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return cityCount;
|
return cityCount;
|
||||||
|
|||||||
@@ -504,7 +504,7 @@ public class Mine extends AbstractGameObject {
|
|||||||
return false;
|
return false;
|
||||||
|
|
||||||
ItemBase resourceIB = ItemBase.getItemBase(this.production.UUID);
|
ItemBase resourceIB = ItemBase.getItemBase(this.production.UUID);
|
||||||
return this.owningGuild.getOwnedCity().getWarehouse().depositFromMine(this, resourceIB, (int)(this.getModifiedProductionAmount() * 0.5f));
|
return this.owningGuild.getOwnedCity().getWarehouse().depositFromMine(this, resourceIB, this.getModifiedProductionAmount());
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean updateGuildOwner(PlayerCharacter playerCharacter) {
|
public boolean updateGuildOwner(PlayerCharacter playerCharacter) {
|
||||||
|
|||||||
@@ -210,6 +210,9 @@ public class LoginServer {
|
|||||||
nextServerTime = LocalDateTime.now().plusSeconds(1);
|
nextServerTime = LocalDateTime.now().plusSeconds(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//load realm for the server pop creation screen
|
||||||
|
Realm.loadAllRealms();
|
||||||
|
|
||||||
if (LocalDateTime.now().isAfter(nextDatabaseTime)) {
|
if (LocalDateTime.now().isAfter(nextDatabaseTime)) {
|
||||||
String pop = SimulationManager.getPopulationString();
|
String pop = SimulationManager.getPopulationString();
|
||||||
Logger.info("Keepalive: " + pop);
|
Logger.info("Keepalive: " + pop);
|
||||||
|
|||||||
Reference in New Issue
Block a user