Browse Source

bane cap sized persist through reboots

lakebane-master
FatBoy-DOTC 9 months ago
parent
commit
3a771ac585
  1. 3
      src/engine/objects/Bane.java
  2. 7
      src/engine/objects/City.java

3
src/engine/objects/Bane.java

@ -107,6 +107,7 @@ public final class Bane {
setDefaultTime(); setDefaultTime();
this.capSize = ZergManager.getBaneCapSize(this.getCity().getGuild()); this.capSize = ZergManager.getBaneCapSize(this.getCity().getGuild());
this.getCity().setSiegesWithstood(this.capSize);
} }
public static boolean summonBanestone(PlayerCharacter player, ClientConnection origin, int rank) { public static boolean summonBanestone(PlayerCharacter player, ClientConnection origin, int rank) {
@ -268,6 +269,7 @@ public final class Bane {
DataWarehouse.pushToWarehouse(baneRecord); DataWarehouse.pushToWarehouse(baneRecord);
bane.capSize = ZergManager.getBaneCapSize(bane.getCity().getGuild()); bane.capSize = ZergManager.getBaneCapSize(bane.getCity().getGuild());
bane.getCity().setSiegesWithstood(bane.capSize);
return true; return true;
} }
@ -344,6 +346,7 @@ public final class Bane {
newBane = DbManager.BaneQueries.LOAD_BANE(city.getObjectUUID()); newBane = DbManager.BaneQueries.LOAD_BANE(city.getObjectUUID());
newBane.capSize = ZergManager.getBaneCapSize(newBane.getCity().getGuild()); newBane.capSize = ZergManager.getBaneCapSize(newBane.getCity().getGuild());
newBane.getCity().setSiegesWithstood(newBane.capSize);
return newBane; return newBane;
} }

7
src/engine/objects/City.java

@ -323,8 +323,11 @@ public class City extends AbstractWorldObject {
writer.putFloat(city.location.z); writer.putFloat(city.location.z);
//writer.putInt(city.siegesWithstood); //writer.putInt(city.siegesWithstood);
writer.putInt(ZergManager.getBaneCapSize(city.getGuild())); if(city.getBane() != null) {
writer.putInt(city.siegesWithstood);
} else{
writer.putInt(ZergManager.getBaneCapSize(city.getGuild()));
}
writer.put((byte) 1); writer.put((byte) 1);
writer.put((byte) 0); writer.put((byte) 0);
writer.putInt(0x64); writer.putInt(0x64);

Loading…
Cancel
Save