Browse Source

bane commander NPC

lakebane2
FatBoy-DOTC 3 weeks ago
parent
commit
7a3c259d2f
  1. 6
      src/engine/net/client/msg/ManageCityAssetsMsg.java
  2. 3
      src/engine/objects/Bane.java
  3. 10
      src/engine/objects/Contract.java

6
src/engine/net/client/msg/ManageCityAssetsMsg.java

@ -392,9 +392,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg { @@ -392,9 +392,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
writer.putInt(bane.getSiegePhase().ordinal()); //1 challenge //2 standoff //3 war
writer.put((byte) 0);
if (!bane.isAccepted() && this.assetManager.getGuild() == banedCity.getGuild() && GuildStatusController.isInnerCouncil(this.assetManager.getGuildStatus()))
writer.put((byte) 1); //canSetTime
else
//if (!bane.isAccepted() && this.assetManager.getGuild() == banedCity.getGuild() && GuildStatusController.isInnerCouncil(this.assetManager.getGuildStatus()))
// writer.put((byte) 1); //canSetTime
//else
writer.put((byte) 0);
DateTime placedOn = bane.getLiveDate();

3
src/engine/objects/Bane.java

@ -505,6 +505,9 @@ public final class Bane { @@ -505,6 +505,9 @@ public final class Bane {
return liveDate;
}
public void setLiveDate_NEW(DateTime baneTime) {
}
public void setLiveDate(DateTime baneTime) {
if (DbManager.BaneQueries.SET_BANE_TIME(baneTime, this.getCity().getObjectUUID())) {

10
src/engine/objects/Contract.java

@ -351,11 +351,21 @@ public class Contract extends AbstractGameObject { @@ -351,11 +351,21 @@ public class Contract extends AbstractGameObject {
if (updateBaneDay > 0) {
if(DbManager.BaneQueries.SET_BANE_DAY_NEW(updateBaneDay,bane.getCityUUID())){
bane.daySet = true;
if(bane.getLiveDate() == null) {
bane.setLiveDate_NEW(bane.getPlacementDate().plusDays(updateBaneDay));
}else{
bane.setLiveDate_NEW(bane.getLiveDate().plusDays(updateBaneDay));
}
}
}
if (updateBaneTime > 0) {
if(DbManager.BaneQueries.SET_BANE_TIME_NEW(updateBaneTime,bane.getCityUUID())){
bane.timeSet = true;
if(bane.getLiveDate() == null) {
bane.setLiveDate_NEW(bane.getPlacementDate().withHourOfDay(12 + updateBaneTime));
}else{
bane.setLiveDate_NEW(bane.getLiveDate().withHourOfDay(12 + updateBaneTime));
}
}
}
if (updateBaneCap > 0) {

Loading…
Cancel
Save