forked from MagicBane/Server
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f5bbc9eee0 | |||
| 4092f7f38f | |||
| a4eea2173d | |||
| d193a12554 |
@@ -290,7 +290,9 @@ public class Mine extends AbstractGameObject {
|
||||
if (treeRank < 1)
|
||||
return false;
|
||||
|
||||
if (guildUnderMineLimit(playerGuild.getNation(), treeRank) == false) {
|
||||
// We check the limit against only the player guild right now
|
||||
// each guild (even within a nation) is limited by the nation tree
|
||||
if (guildUnderMineLimit(playerGuild, treeRank) == false) {
|
||||
ErrorPopupMsg.sendErrorMsg(playerCharacter, "Your nation cannot support another mine.");
|
||||
return false;
|
||||
}
|
||||
@@ -304,10 +306,11 @@ public class Mine extends AbstractGameObject {
|
||||
|
||||
mineCnt += Mine.getMinesForGuild(playerGuild.getObjectUUID()).size();
|
||||
|
||||
for (Guild guild : playerGuild.getSubGuildList())
|
||||
mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size();
|
||||
// Only count mines for a specific guild
|
||||
//for (Guild guild : playerGuild.getSubGuildList())
|
||||
// mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size();
|
||||
|
||||
return mineCnt <= tolRank;
|
||||
return mineCnt <= (tolRank * 2);
|
||||
}
|
||||
|
||||
public boolean changeProductionType(Resource resource) {
|
||||
|
||||
@@ -128,10 +128,12 @@ public class HourlyJobThread implements Runnable {
|
||||
if (mine.isActive == false)
|
||||
return false;
|
||||
|
||||
Logger.info(mine.getZoneName() + "'s Mine is now Closing");
|
||||
|
||||
Building mineBuilding = BuildingManager.getBuildingFromCache(mine.getBuildingID());
|
||||
|
||||
if (mineBuilding == null) {
|
||||
Logger.debug("Null mine building for Mine " + mine.getObjectUUID() + " Building " + mine.getBuildingID());
|
||||
Logger.info("Null mine building for Mine " + mine.getObjectUUID() + " Building " + mine.getBuildingID());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -139,6 +141,8 @@ public class HourlyJobThread implements Runnable {
|
||||
// We can early exit here.
|
||||
|
||||
if (mineBuilding.getRank() > 0) {
|
||||
Logger.info("Mine still standing when closing window. Mine Object UUID: " + mine.getObjectUUID() + " Building Id: " + mine.getBuildingID());
|
||||
|
||||
mine.setActive(false);
|
||||
mine.lastClaimer = null;
|
||||
return true;
|
||||
@@ -149,6 +153,8 @@ public class HourlyJobThread implements Runnable {
|
||||
// and keep the window open.
|
||||
|
||||
if (!Mine.validateClaimer(mine.lastClaimer)) {
|
||||
Logger.info("Mine has no valid claimer when closing window. Mine Object UUID: " + mine.getObjectUUID() + " Building Id: " + mine.getBuildingID());
|
||||
|
||||
mine.lastClaimer = null;
|
||||
mine.updateGuildOwner(null);
|
||||
mine.setActive(true);
|
||||
@@ -157,6 +163,8 @@ public class HourlyJobThread implements Runnable {
|
||||
|
||||
//Update ownership to map
|
||||
|
||||
Logger.info("Mine ownership changing when closing window. Mine Object UUID: " + mine.getObjectUUID() + " Building Id: " + mine.getBuildingID() + " new owning guild: " + mine.getOwningGuild().getObjectUUID());
|
||||
|
||||
mine.guildName = mine.getOwningGuild().getName();
|
||||
mine.guildTag = mine.getOwningGuild().getGuildTag();
|
||||
Guild nation = mine.getOwningGuild().getNation();
|
||||
|
||||
Reference in New Issue
Block a user