boxed character fix, safezone equipment damage fix, trade fix, creation experience fix, sub guild limits removed

This commit is contained in:
2024-02-11 09:36:10 -06:00
parent 6641651f3c
commit 668df83e33
4 changed files with 39 additions and 15 deletions
+5 -4
View File
@@ -12,10 +12,7 @@ package engine.objects;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.Enum.ItemType;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.*;
import engine.math.Vector3fImmutable;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -2435,6 +2432,10 @@ public class CharacterItemManager {
if (item == null || amount < 1 || amount > 5)
return;
if(ZoneManager.findSmallestZone(this.getOwner().loc).getSafeZone() == 1){
return;
}
//verify the item is equipped by this player
int slot = item.getEquipSlot();
if (!this.equipped.containsKey(slot))
+8 -11
View File
@@ -730,32 +730,29 @@ public class Guild extends AbstractWorldObject {
public boolean canSubAGuild(Guild toSub) {
boolean canSub;
boolean canSubToNation;
boolean canAcceptSub;
if (this.equals(toSub))
return false;
switch (this.guildState) {
case Nation:
case Sovereign:
canSub = true;
canAcceptSub = true;
break;
default:
canSub = false;
canAcceptSub = false;
}
switch (toSub.guildState) {
case Errant:
case Sovereign:
canSub = true;
canSubToNation = true;
break;
default:
canSub = false;
canSubToNation = false;
}
City nationCap = City.getCity(nation.cityUUID);
if (nation.getSubGuildList().size() >= nationCap.getRank()) {
canSub = false;
}
return canSub;
return canAcceptSub && canSubToNation;
}
public int getRealmsOwnedFlag() {
+5
View File
@@ -174,6 +174,8 @@ public class PlayerCharacter extends AbstractCharacter {
private boolean dirtyLoad = true;
private final ReadWriteLock dirtyLock = new ReentrantReadWriteLock(true);
public boolean isBoxed = false;
/**
* No Id Constructor
*/
@@ -4811,6 +4813,9 @@ public class PlayerCharacter extends AbstractCharacter {
this.safeZone = this.isInSafeZone();
if(this.isBoxed == true && this.containsEffect(1672601862) == false)
PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
} catch (Exception e) {
Logger.error(e);
} finally {