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

Merge remote-tracking branch 'origin/post-wipe-merge' into refinement-fix

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-01-11 20:10:42 -06:00
parent c9972962d1 4b8e0cb041
commit 523e83a49c
9 changed files with 268 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Guild.java
+18 -7
View File
@@ -40,7 +40,10 @@ import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
@@ -79,6 +82,7 @@ public class Guild extends AbstractWorldObject {
private String hash;
private boolean ownerIsNPC;
public LocalDateTime lastWooEditTime;
public HashMap<Integer,GuildAlliances> guildAlliances = new HashMap<>();
/**
@@ -176,8 +180,13 @@ public class Guild extends AbstractWorldObject {
this.teleportMax = rs.getInt("teleportMax");
this.mineTime = rs.getInt("mineTime");
this.hash = rs.getString("hash");
Timestamp lastWooRequest = rs.getTimestamp("lastWooEditTime");
if (lastWooRequest != null)
this.lastWooEditTime = lastWooRequest.toLocalDateTime();
this.hash = rs.getString("hash");
}
public void setNation(Guild nation) {
@@ -565,11 +574,10 @@ public class Guild extends AbstractWorldObject {
if (this.equals(toSub))
return false;
switch(this.guildState){
case Nation:
case Sovereign:
canSub = true;
switch(this.guildState) {
case Nation:
case Sovereign:
canSub = true;
break;
default:
canSub = false;
@@ -583,7 +591,10 @@ public class Guild extends AbstractWorldObject {
default:
canSub = false;
}
City nationCap = City.getCity(nation.cityUUID);
if (nation.getSubGuildList().size() >= nationCap.getRank()) {
canSub = false;
}
return canSub;
}
src/engine/objects/Mine.java
+16 -47
View File
@@ -35,6 +35,7 @@ import org.pmw.tinylog.Logger;
import java.net.UnknownHostException;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.concurrent.ConcurrentHashMap;
@@ -141,48 +142,17 @@ public class Mine extends AbstractGameObject {
this.lastClaimerID = 0;
this.lastClaimerSessionID = null;
java.sql.Timestamp mineTimeStamp = rs.getTimestamp("mine_openDate");
Building building = BuildingManager.getBuildingFromCache(this.buildingID);
if (mineTimeStamp == null && (this.owningGuild == null || this.owningGuild.isErrant() || building.getRank() < 1)){
if (building != null){
String zoneName = building.getParentZone().getName();
String parentZoneName = building.getParentZone().getParent().getName();
Logger.info(zoneName + " in " + parentZoneName + " has a dirty mine, setting active.");
}
this.dirtyMine = true;
openDate = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
return;
}else if (this.owningGuild.isErrant() || nation.isErrant()){
openDate = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
return;
}else if (mineTimeStamp == null){
this.openDate = LocalDateTime.now().withHour(mineTime).withMinute(0).withSecond(0).withNano(0);
Timestamp mineOpenDateTime = rs.getTimestamp("mine_openDate");
if (mineOpenDateTime != null)
this.openDate = mineOpenDateTime.toLocalDateTime();
// Set opendate to tomorrow if window has passed
if (LocalDateTime.now().isAfter(this.openDate.plusHours(1)))
this.openDate = this.openDate.plusDays(1);
return;
}else{
this.openDate = mineTimeStamp.toLocalDateTime().withHour(mineTime);
if (LocalDateTime.now().isAfter(this.openDate.plusHours(1))){
this.openDate = this.openDate.plusDays(1);
return;
}
}
//after 1 day...
if(this.openDate.getDayOfYear() - LocalDateTime.now().getDayOfYear() > 1){
this.openDate = this.openDate.withDayOfYear(LocalDateTime.now().getDayOfYear());
if (LocalDateTime.now().isAfter(this.openDate.plusHours(1)))
this.openDate = this.openDate.plusDays(1);
return;
}
this.openDate = LocalDateTime.now().plusDays(1).withHour(this.openDate.getHour()).withMinute(0).withSecond(0).withNano(0);
}
public static void SendMineAttackMessage(Building mine){
@@ -258,10 +228,6 @@ try{
*/
private void initializeMineTime(){
//Mine time has already been set at loading from the database. skip.
if (this.openDate != null)
return;
Guild nation = null;
@@ -270,7 +236,7 @@ try{
int mineTime = (nation != null && !nation.isErrant()) ? nation.getMineTime() : MBServerStatics.MINE_EARLY_WINDOW;
LocalDateTime openDate = LocalDateTime.now().withHour(mineTime).withMinute(0).withSecond(0).withNano(0);
this.openDate = this.openDate.withHour(mineTime).withMinute(0).withSecond(0).withNano(0);
//Failed to Update Database, default mine time.
@@ -281,8 +247,6 @@ try{
return;
}
this.openDate = openDate;
}
public boolean changeProductionType(Resource resource){
@@ -560,6 +524,11 @@ try{
public boolean handleEndMineWindow(){
// No need to end the window of a mine which never opened.
if (this.isActive == false)
return false;
Building mineBuilding = BuildingManager.getBuildingFromCache(this.buildingID);
if (mineBuilding == null){