Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Project reformat.

Browse Source
This commit is contained in:
MagicBot
2024-06-11 13:40:42 -04:00
parent 678ccafd3c
commit c935ea1986
7 changed files with 68 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+2 -2
View File
@@ -806,7 +806,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
speed *= (1 + abstractCharacter.bonuses.getFloatPercentAll(ModType.WeaponSpeed, SourceType.None));
PlayerBonuses bonuses = abstractCharacter.bonuses;
if(bonuses != null){
if (bonuses != null) {
ModType modType = ModType.AttackDelay;
for (AbstractEffectModifier mod : bonuses.bonusFloats.keySet()) {
@@ -1829,7 +1829,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
Mob target = (Mob) this;
if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter)) {
if(target.playerAgroMap.containsKey(attacker.getObjectUUID()))
if (target.playerAgroMap.containsKey(attacker.getObjectUUID()))
target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
else
target.playerAgroMap.put(attacker.getObjectUUID(), value);
src/engine/objects/Bane.java
+6 -6
View File
@@ -641,18 +641,18 @@ public final class Bane {
return cityUUID;
}
public void startBane(){
public void startBane() {
City city = this.getCity();
if(city == null)
if (city == null)
return;
this.isStarted = true; //flag the bane as started
for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(city.loc,mbEnums.CityBoundsType.ZONE.halfExtents + 64,MBServerStatics.MASK_BUILDING)){
Building building = (Building)awo;
if(building == null)
for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(city.loc, mbEnums.CityBoundsType.ZONE.halfExtents + 64, MBServerStatics.MASK_BUILDING)) {
Building building = (Building) awo;
if (building == null)
continue;
if(building.protectionState.equals(ProtectionState.UNDERSIEGE) == false)
if (building.protectionState.equals(ProtectionState.UNDERSIEGE) == false)
building.protectionState = ProtectionState.UNDERSIEGE;
}
src/engine/objects/City.java
+2 -2
View File
@@ -300,7 +300,7 @@ public class City extends AbstractWorldObject {
//handle compiling of cities able to be teleported to for lore rule-set
for (AbstractGameObject ago : worldCities.values()) {
City city = (City) ago;
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
continue; // cannot teleport to perdition or bastion
if (city.isNpc == 1 && city.getGuild().charter.equals(pc.guild.charter)) {
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter
@@ -407,7 +407,7 @@ public class City extends AbstractWorldObject {
//handle compiling of cities able to be repledged to for lore rule-set
for (AbstractGameObject ago : worldCities.values()) {
City city = (City) ago;
if(city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
if (city.cityName.equals("Perdition") || city.cityName.equals("Bastion"))
continue; // cannot repledge to perdition or bastion
if (city.isNpc == 1 && city.getGuild().charter.canJoin(playerCharacter)) {
cities.add(city); // anyone of the same charter can teleport to a safehold of that charter