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

create PlayerManager static class

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-05 20:47:33 -06:00
parent 76eed79b0a
commit 450ae2ec82
87 changed files with 2730 additions and 2853 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractCharacter.java
+11 -11
View File
@@ -57,7 +57,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
protected short statIntCurrent;
protected short statSpiCurrent;
protected short unusedStatPoints;
protected int exp;
public int exp;
public int buildingUUID;
public Building building;
@@ -67,8 +67,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
public int guildUUID;
public Guild guild;
protected byte runningTrains;
protected ConcurrentHashMap<Integer, CharacterPower> powers;
protected ConcurrentHashMap<String, CharacterSkill> skills;
public ConcurrentHashMap<Integer, CharacterPower> powers;
public ConcurrentHashMap<String, CharacterSkill> skills;
// Variables NOT to be stored in db
protected boolean sit = false;
protected boolean walkMode;
@@ -80,11 +80,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
// ticking down so that mobs/players following dont just move away to your projected location
protected Vector3fImmutable nextEndLoc = Vector3fImmutable.ZERO;
protected float speed;
protected AtomicFloat stamina = new AtomicFloat();
public AtomicFloat stamina = new AtomicFloat();
protected float staminaMax;
protected AtomicFloat mana = new AtomicFloat();
public AtomicFloat mana = new AtomicFloat();
protected float manaMax; // Health/Mana/Stamina
protected AtomicBoolean isAlive = new AtomicBoolean(true);
public AtomicBoolean isAlive = new AtomicBoolean(true);
protected Resists resists = new Resists("Genric");
protected ConcurrentHashMap<String, JobContainer> timers;
protected ConcurrentHashMap<String, Long> timestamps;
@@ -102,7 +102,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
protected boolean isActive; // <-Do not use this for deleting character!
protected float altitude = 0; // 0=on terrain, 1=tier 1, 2=tier 2, etc.
protected ConcurrentHashMap<Integer, JobContainer> recycleTimers;
protected PlayerBonuses bonuses;
public PlayerBonuses bonuses;
protected JobContainer lastChant;
protected boolean isCasting = false;
protected long lastSetLocUpdate = 0L;
@@ -363,7 +363,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
switch (abstractCharacter.getObjectType()) {
case PlayerCharacter:
PlayerCharacter.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
PlayerManager.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
break;
case Mob:
Mob.serializeMobForClientMsgOtherPlayer((Mob) abstractCharacter, writer);
@@ -445,7 +445,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
playerCharacter.calculateItemBonuses();
//recalculate formulas
PlayerCharacter.recalculatePlayerStatsOnLoad(playerCharacter);
PlayerManager.recalculatePlayerStatsOnLoad(playerCharacter);
} catch (Exception e) {
Logger.error(e);
@@ -746,7 +746,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
}
if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
if (((PlayerCharacter) this).isLastSwimming())
if (PlayerManager.isLastSwimming(((PlayerCharacter) this)))
return 1; //swimming
return 2; //ground
@@ -1707,7 +1707,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
if (CanFly(player) == false &&
player.getMovementState().equals(MovementState.FLYING))
PlayerCharacter.GroundPlayer(player);
PlayerManager.GroundPlayer(player);
}
} catch (Exception e) {
src/engine/objects/AbstractGameObject.java
+2 -1
View File
@@ -12,6 +12,7 @@ package engine.objects;
import engine.Enum.GameObjectType;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.job.JobContainer;
import engine.job.JobScheduler;
import engine.jobs.DatabaseUpdateJob;
@@ -107,7 +108,7 @@ public abstract class AbstractGameObject {
switch (objectType) {
case PlayerCharacter:
return PlayerCharacter.getPlayerCharacter(tableID);
return PlayerManager.getPlayerCharacter(tableID);
case NPC:
return NPC.getNPC(tableID);
src/engine/objects/AbstractWorldObject.java
+7 -6
View File
@@ -15,6 +15,7 @@ import engine.Enum.GameObjectType;
import engine.Enum.GridObjectType;
import engine.InterestManagement.HeightMap;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.PlayerManager;
import engine.job.AbstractScheduleJob;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -39,7 +40,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public abstract class AbstractWorldObject extends AbstractGameObject {
protected final ReadWriteLock locationLock = new ReentrantReadWriteLock(true);
public final ReadWriteLock locationLock = new ReentrantReadWriteLock(true);
protected final ReadWriteLock updateLock = new ReentrantReadWriteLock(true);
public float healthMax;
public ConcurrentHashMap<String, Effect> effects = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
@@ -49,7 +50,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
public Regions landingRegion = null;
public Vector3fImmutable lastLoc = Vector3fImmutable.ZERO;
public Vector3fImmutable loc = new Vector3fImmutable(0.0f, 0.0f, 0.0f);
protected AtomicFloat health = new AtomicFloat();
public AtomicFloat health = new AtomicFloat();
protected boolean load = true;
protected GridObjectType gridObjectType;
protected float altitude = 0;
@@ -150,7 +151,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
Regions region = null;
if (worldObject.getObjectType().equals(GameObjectType.PlayerCharacter))
if (((PlayerCharacter) worldObject).isFlying())
if (PlayerManager.isFlying(((PlayerCharacter) worldObject)))
return null;
//Find building
for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(worldObject.getLoc(), MBServerStatics.STRUCTURE_LOAD_RANGE, MBServerStatics.MASK_BUILDING)) {
@@ -271,7 +272,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
if (name.equals("Flight")) {
((PlayerCharacter) this).update(false);
PlayerCharacter.GroundPlayer((PlayerCharacter) this);
PlayerManager.GroundPlayer((PlayerCharacter) this);
}
}
applyAllBonuses();
@@ -386,7 +387,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
//ground player
if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
((PlayerCharacter) this).update(false);
PlayerCharacter.GroundPlayer((PlayerCharacter) this);
PlayerManager.GroundPlayer((PlayerCharacter) this);
}
}
} else {
@@ -415,7 +416,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
//ground player
if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
((PlayerCharacter) this).update(false);
PlayerCharacter.GroundPlayer((PlayerCharacter) this);
PlayerManager.GroundPlayer((PlayerCharacter) this);
}
}
src/engine/objects/Account.java
+2 -1
View File
@@ -14,6 +14,7 @@ import engine.Enum.DispatchChannel;
import engine.Enum.ItemContainerType;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -163,7 +164,7 @@ public class Account extends AbstractGameObject {
ArrayList<PlayerCharacter> playerList = DbManager.PlayerCharacterQueries.GET_CHARACTERS_FOR_ACCOUNT(this.getObjectUUID());
for (PlayerCharacter player : playerList) {
PlayerCharacter.initializePlayer(player);
PlayerManager.initializePlayer(player);
this.characterMap.putIfAbsent(player.getObjectUUID(), player);
}
src/engine/objects/Bane.java
+5 -5
View File
@@ -261,7 +261,7 @@ public final class Bane {
Vector3fImmutable movePlayerOutsideStone = player.getLoc();
movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
player.teleport(movePlayerOutsideStone);
PlayerManager.teleport(player, movePlayerOutsideStone);
// Notify players
@@ -734,7 +734,7 @@ public final class Bane {
HashSet<AbstractWorldObject> inSiegeRange = WorldGrid.getObjectsInRangePartial(city.getTOL().loc,1750f,1);
for(AbstractWorldObject obj : inSiegeRange){
int uuid = obj.getObjectUUID();
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
if(player == null)
continue;
Guild playerNation = player.guild.getNation();
@@ -749,7 +749,7 @@ public final class Bane {
int attackerSize = 0;
int defenderSize = 0;
for(int uuid : city.baneAttendees.keySet()){
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
if(player == null)
continue;
if(player.guild.getNation().equals(defendNation))
@@ -762,7 +762,7 @@ public final class Bane {
float attackerMultiplier = ZergManager.getCurrentMultiplier(attackerSize,this.capSize);
float defenderMultiplier = ZergManager.getCurrentMultiplier(defenderSize,this.capSize);
for(int uuid : attackers){
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
player.ZergMultiplier = attackerMultiplier;
else
@@ -770,7 +770,7 @@ public final class Bane {
}
for(int uuid : defenders){
PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
player.ZergMultiplier = defenderMultiplier;
else
src/engine/objects/Building.java
+3 -2
View File
@@ -19,6 +19,7 @@ import engine.db.archive.DataWarehouse;
import engine.db.archive.MineRecord;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.ZoneManager;
import engine.job.JobContainer;
import engine.job.JobScheduler;
@@ -970,7 +971,7 @@ public class Building extends AbstractWorldObject {
if (this.ownerIsNPC)
return NPC.getFromCache(this.ownerUUID);
return PlayerCharacter.getFromCache(this.ownerUUID);
return PlayerManager.getFromCache(this.ownerUUID);
}
@@ -1095,7 +1096,7 @@ public class Building extends AbstractWorldObject {
Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());
} else if (this.ownerUUID != 0) {
if (PlayerCharacter.getPlayerCharacter(this.ownerUUID) == null) {
if (PlayerManager.getPlayerCharacter(this.ownerUUID) == null) {
Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load Player Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());
}
}
src/engine/objects/CharacterItemManager.java
+4 -7
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;
@@ -424,7 +421,7 @@ public class CharacterItemManager {
public synchronized boolean tradeRequest(TradeRequestMsg msg) {
PlayerCharacter source = (PlayerCharacter) this.getOwner();
PlayerCharacter target = PlayerCharacter.getFromCache(msg.getPlayerID());
PlayerCharacter target = PlayerManager.getFromCache(msg.getPlayerID());
Dispatch dispatch;
if (!canTrade(source, target)) {
@@ -450,7 +447,7 @@ public class CharacterItemManager {
}
public synchronized boolean invalidTradeRequest(InvalidTradeRequestMsg msg) {
PlayerCharacter requester = PlayerCharacter.getFromCache(msg.getRequesterID());
PlayerCharacter requester = PlayerManager.getFromCache(msg.getRequesterID());
Dispatch dispatch;
dispatch = Dispatch.borrow(requester, msg);
@@ -495,7 +492,7 @@ public class CharacterItemManager {
public synchronized boolean acceptTradeRequest(AcceptTradeRequestMsg msg) {
PlayerCharacter source = (PlayerCharacter) this.getOwner();
PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
PlayerCharacter target = PlayerManager.getFromCache(msg.getTargetID());
Dispatch dispatch;
src/engine/objects/CharacterPower.java
+2 -1
View File
@@ -10,6 +10,7 @@
package engine.objects;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.PowersManager;
import engine.net.ByteBufferWriter;
import engine.net.client.msg.ErrorPopupMsg;
@@ -90,7 +91,7 @@ public class CharacterPower extends AbstractGameObject {
}
public static PlayerCharacter getOwner(CharacterPower cp) {
return PlayerCharacter.getFromCache(cp.ownerUID);
return PlayerManager.getFromCache(cp.ownerUID);
}
/*
src/engine/objects/CharacterSkill.java
+2 -1
View File
@@ -14,6 +14,7 @@ import engine.Enum.CharacterSkills;
import engine.Enum.ModType;
import engine.Enum.SourceType;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.net.ByteBufferWriter;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -287,7 +288,7 @@ public class CharacterSkill extends AbstractGameObject {
if (cs.isMobOwner)
return Mob.getFromCache(cs.ownerUID);
else
return PlayerCharacter.getFromCache(cs.ownerUID);
return PlayerManager.getFromCache(cs.ownerUID);
}
/*
src/engine/objects/City.java
+7 -7
View File
@@ -694,7 +694,7 @@ public class City extends AbstractWorldObject {
if (this.isNpc == 1)
return NPC.getNPC(ownerID);
else
return PlayerCharacter.getPlayerCharacter(ownerID);
return PlayerManager.getPlayerCharacter(ownerID);
}
public Guild getGuild() {
@@ -882,7 +882,7 @@ public class City extends AbstractWorldObject {
continue;
player = (PlayerCharacter) playerObject;
player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, true, this);
PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, true, this);
}
}
@@ -903,7 +903,7 @@ public class City extends AbstractWorldObject {
for (Integer playerID : this._playerMemory) {
player = PlayerCharacter.getFromCache(playerID);
player = PlayerManager.getFromCache(playerID);
if (player == null)
continue;
@@ -912,7 +912,7 @@ public class City extends AbstractWorldObject {
// Reapply effect with timeout?
if (refreshEffect == true)
player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
}
@@ -969,7 +969,7 @@ public class City extends AbstractWorldObject {
if (effectBase == null)
continue;
player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, true, this);
PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, true, this);
}
} catch (Exception e) {
Logger.error(e.getMessage());
@@ -992,7 +992,7 @@ public class City extends AbstractWorldObject {
return;
// player.endEffectNoPower(cityEffect);
player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, false, this);
PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, false, this);
}
} catch (Exception e) {
Logger.error(e.getMessage());
@@ -1089,7 +1089,7 @@ public class City extends AbstractWorldObject {
playerUUID = iter.next();
player = PlayerCharacter.getFromCache(playerUUID);
player = PlayerManager.getFromCache(playerUUID);
if (this.isLocationWithinSiegeBounds(player.getLoc()))
continue;
src/engine/objects/Contract.java
+1 -1
View File
@@ -242,7 +242,7 @@ public class Contract extends AbstractGameObject {
}
break;
case 15020401:
PlayerCharacter.unboxPlayer(pc);
PlayerManager.unboxPlayer(pc);
vd.getOptions().clear();
break;
}
src/engine/objects/Experience.java
+3 -2
View File
@@ -11,6 +11,7 @@ package engine.objects;
import engine.Enum;
import engine.Enum.TargetColor;
import engine.gameManager.PlayerManager;
import engine.gameManager.ZoneManager;
import engine.math.Vector3fImmutable;
import engine.server.MBServerStatics;
@@ -444,7 +445,7 @@ public class Experience {
grantedExperience = 1;
// Grant the player the EXP
playerCharacter.grantXP((int) Math.floor(grantedExperience));
PlayerManager.grantXP(playerCharacter, (int) Math.floor(grantedExperience));
}
} else { // Give EXP to a single character
@@ -471,7 +472,7 @@ public class Experience {
grantedExperience *= .6;
// Grant XP
killer.grantXP((int) Math.floor(grantedExperience));
PlayerManager.grantXP(killer, (int) Math.floor(grantedExperience));
}
}
}
src/engine/objects/Guild.java
+8 -8
View File
@@ -180,7 +180,7 @@ public class Guild extends AbstractWorldObject {
if (guild.ownerIsNPC)
return NPC.getFromCache(guild.guildLeaderUUID);
return PlayerCharacter.getFromCache(guild.guildLeaderUUID);
return PlayerManager.getFromCache(guild.guildLeaderUUID);
}
public static boolean sameGuild(Guild a, Guild b) {
@@ -268,7 +268,7 @@ public class Guild extends AbstractWorldObject {
writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus())); // TODO Double check this is
// title and rank
if (GuildStatusController.isGuildLeader(pc.getGuildStatus()))
writer.putInt(PlayerCharacter.GetPlayerRealmTitle(pc));
writer.putInt(PlayerManager.GetPlayerRealmTitle(pc));
else
writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
//writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
@@ -576,14 +576,14 @@ public class Guild extends AbstractWorldObject {
return false;
}
PlayerCharacter oldGuildLeader = PlayerCharacter.getFromCache(this.guildLeaderUUID);
PlayerCharacter oldGuildLeader = PlayerManager.getFromCache(this.guildLeaderUUID);
//old guildLeader no longer has guildLeadership stauts.
if (oldGuildLeader != null)
oldGuildLeader.setGuildLeader(false);
PlayerManager.setGuildLeader(oldGuildLeader, false);
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
((PlayerCharacter) ac).setGuildLeader(true);
PlayerManager.setGuildLeader(((PlayerCharacter) ac), true);
this.guildLeaderUUID = ac.getObjectUUID();
return true;
@@ -597,7 +597,7 @@ public class Guild extends AbstractWorldObject {
return false;
if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
((PlayerCharacter) ac).setGuildLeader(true);
PlayerManager.setGuildLeader(((PlayerCharacter) ac), true);
this.guildLeaderUUID = ac.getObjectUUID();
return true;
@@ -665,7 +665,7 @@ public class Guild extends AbstractWorldObject {
}
// Clear Guild Ranks
pc.resetGuildStatuses();
PlayerManager.resetGuildStatuses(pc);
pc.setGuild(Guild.getErrantGuild());
pc.incVer();
@@ -835,7 +835,7 @@ public class Guild extends AbstractWorldObject {
Logger.info("Guild UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.guildLeaderUUID);
} else if (this.guildLeaderUUID != 0) {
if (PlayerCharacter.getPlayerCharacter(this.guildLeaderUUID) == null)
if (PlayerManager.getPlayerCharacter(this.guildLeaderUUID) == null)
Logger.info("Guild UID " + this.getObjectUUID() + " Failed to Load Player Owner with ID " + this.guildLeaderUUID);
}
src/engine/objects/Heraldry.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.objects;
import engine.Enum.GameObjectType;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import org.pmw.tinylog.Logger;
import java.sql.ResultSet;
@@ -125,7 +126,7 @@ public class Heraldry {
// Player is deleted, add to purge list
if (PlayerCharacter.getFromCache(characterID) == null)
if (PlayerManager.getFromCache(characterID) == null)
purgeList.add(characterID);
}
src/engine/objects/Item.java
+3 -3
View File
@@ -14,6 +14,7 @@ import engine.Enum.*;
import engine.exception.SerializationException;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.PowersManager;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -23,7 +24,6 @@ import engine.net.client.ClientConnection;
import engine.net.client.msg.DeleteItemMsg;
import engine.powers.EffectsBase;
import engine.powers.effectmodifiers.AbstractEffectModifier;
import engine.powers.effectmodifiers.WeaponProcEffectModifier;
import engine.powers.poweractions.AbstractPowerAction;
import engine.server.MBServerStatics;
import org.pmw.tinylog.Logger;
@@ -287,7 +287,7 @@ public class Item extends AbstractWorldObject {
boolean isBeard = (item.equipSlot == (byte) MBServerStatics.SLOT_BEARDSTYLE);
int itemColor = 0;
if (isHair || isBeard) {
PlayerCharacter pc = PlayerCharacter.getFromCache(item.ownerID);
PlayerCharacter pc = PlayerManager.getFromCache(item.ownerID);
if (pc != null)
if (isHair)
itemColor = pc.getHairColor();
@@ -851,7 +851,7 @@ public class Item extends AbstractWorldObject {
if (this.ownerType == OwnerType.Npc)
return NPC.getFromCache(this.ownerID);
else if (this.ownerType == OwnerType.PlayerCharacter)
return PlayerCharacter.getFromCache(this.ownerID);
return PlayerManager.getFromCache(this.ownerID);
else if (this.ownerType == OwnerType.Mob)
return Mob.getFromCache(this.ownerID);
else if (this.ownerType == OwnerType.Account)
src/engine/objects/Mine.java
+1 -5
View File
@@ -10,11 +10,8 @@
package engine.objects;
import engine.Enum;
import engine.InterestManagement.InterestManager;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.*;
import engine.math.Vector3f;
import engine.math.Vector3fImmutable;
import engine.net.ByteBufferWriter;
import engine.net.client.msg.ErrorPopupMsg;
import engine.server.MBServerStatics;
@@ -27,7 +24,6 @@ import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.concurrent.ConcurrentHashMap;
import static engine.gameManager.DbManager.MineQueries;
@@ -677,7 +673,7 @@ public class Mine extends AbstractGameObject {
ArrayList<Integer>toRemove = new ArrayList<>();
HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
for(Integer id : currentMemory){
PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(id);
PlayerCharacter pc = PlayerManager.getPlayerCharacter(id);
if(currentPlayers.contains(pc) == false){
toRemove.add(id);
pc.ZergMultiplier = 1.0f;
src/engine/objects/Mob.java
+1 -1
View File
@@ -1130,7 +1130,7 @@ public class Mob extends AbstractIntelligenceAgent {
if (this.ownerUID == 0)
return null;
return PlayerCharacter.getFromCache(this.ownerUID);
return PlayerManager.getFromCache(this.ownerUID);
}
public void setOwner(PlayerCharacter value) {
src/engine/objects/PlayerCharacter.java
+64 -2605
View File
File diff suppressed because it is too large Load Diff
src/engine/objects/Portal.java
+2 -1
View File
@@ -4,6 +4,7 @@ import engine.Enum;
import engine.Enum.PortalType;
import engine.InterestManagement.WorldGrid;
import engine.gameManager.ConfigManager;
import engine.gameManager.PlayerManager;
import engine.job.JobScheduler;
import engine.jobs.CloseGateJob;
import engine.math.Vector3fImmutable;
@@ -104,7 +105,7 @@ public class Portal {
if (player.getTimeStamp("lastMoveGate") < this.lastActive)
return;
player.teleport(targetGate.getLoc());
PlayerManager.teleport(player, targetGate.getLoc());
player.setSafeMode();
}
src/engine/objects/Realm.java
+2 -1
View File
@@ -14,6 +14,7 @@ import engine.InterestManagement.RealmMap;
import engine.db.archive.DataWarehouse;
import engine.db.archive.RealmRecord;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.PowersManager;
import engine.net.ByteBufferWriter;
import engine.powers.PowersBase;
@@ -281,7 +282,7 @@ public class Realm {
if (this.getRulingCity().getTOL() == null)
return;
rulingCharacter = PlayerCharacter.getPlayerCharacter(this.getRulingCity().getTOL().getOwnerUUID());
rulingCharacter = PlayerManager.getPlayerCharacter(this.getRulingCity().getTOL().getOwnerUUID());
if (rulingCharacter == null) {
Logger.info(this.realmName + " failed to load " + this.getRulingCity().getCityName() + " ID : " + this.rulingCityUUID);
return;