evilight/magicbane
1
0 Fork 0
forked from MagicBane/Server
Code Pull Requests Activity

create PlayerManager static class

Browse Source
This commit is contained in:
FatBoy committed 2025-01-05 20:47:33 -06:00
1 parent 76eed79b0a
commit 450ae2ec82
87 files changed
+2730 -2853
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/engine/net/client/ClientMessagePump.java
+15 -15
View File
@@ -603,19 +603,19 @@ public class ClientMessagePump implements NetMsgHandler {
switch (type) {
case MBServerStatics.STAT_STR_ID:
pc.addStr(msg.getAmount());
PlayerManager.addStr(pc, msg.getAmount());
break;
case MBServerStatics.STAT_DEX_ID:
pc.addDex(msg.getAmount());
PlayerManager.addDex(pc, msg.getAmount());
break;
case MBServerStatics.STAT_CON_ID:
pc.addCon(msg.getAmount());
PlayerManager.addCon(pc, msg.getAmount());
break;
case MBServerStatics.STAT_INT_ID:
pc.addInt(msg.getAmount());
PlayerManager.addInt(pc, msg.getAmount());
break;
case MBServerStatics.STAT_SPI_ID:
pc.addSpi(msg.getAmount());
PlayerManager.addSpi(pc, msg.getAmount());
break;
}
}
@@ -641,7 +641,7 @@ public class ClientMessagePump implements NetMsgHandler {
// ResetAfterDeath player
sourcePlayer.respawnLock.writeLock().lock();
try {
sourcePlayer.respawn(true, false, true);
PlayerManager.respawn(sourcePlayer, true, false, true);
} catch (Exception e) {
Logger.error(e);
@@ -705,7 +705,7 @@ public class ClientMessagePump implements NetMsgHandler {
switch (targetType) {
case PlayerCharacter:
characterTarget = PlayerCharacter.getFromCache(msg.getTargetID());
characterTarget = PlayerManager.getFromCache(msg.getTargetID());
if (characterTarget == null)
return;
if (characterTarget.isAlive())
@@ -809,7 +809,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (targetType == GameObjectType.PlayerCharacter.ordinal() || targetType == GameObjectType.Mob.ordinal()) {
if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
tar = PlayerCharacter.getFromCache(targetID);
tar = PlayerManager.getFromCache(targetID);
if (tar == null)
return;
@@ -1013,7 +1013,7 @@ public class ClientMessagePump implements NetMsgHandler {
AbstractCharacter tar = null;
if (targetType == GameObjectType.PlayerCharacter.ordinal())
tar = PlayerCharacter.getFromCache(msg.getTargetID());
tar = PlayerManager.getFromCache(msg.getTargetID());
else if (targetType == GameObjectType.NPC.ordinal())
tar = NPC.getFromCache(msg.getTargetID());
else if (targetType == GameObjectType.Mob.ordinal())
@@ -1166,7 +1166,7 @@ public class ClientMessagePump implements NetMsgHandler {
if (con == null)
return;
float bargain = sourcePlayer.getBargain();
float bargain = PlayerManager.getBargain(sourcePlayer);
float profit = npc.getBuyPercent(sourcePlayer) + bargain;
@@ -1271,7 +1271,7 @@ public class ClientMessagePump implements NetMsgHandler {
float durabilityMax = sell.getDurabilityMax();
float damagedModifier = durabilityCurrent / durabilityMax;
cost *= damagedModifier;
float bargain = player.getBargain();
float bargain = PlayerManager.getBargain(player);
float profit = npc.getBuyPercent(player) + bargain;
@@ -1422,7 +1422,7 @@ public class ClientMessagePump implements NetMsgHandler {
return;
}
int cost = me.getMagicValue();
float bargain = sourcePlayer.getBargain();
float bargain = PlayerManager.getBargain(sourcePlayer);
switch(npc.getContractID()){
case 1201:
cost = ItemBase.getDiscPrice(ib.getUUID());
@@ -1503,7 +1503,7 @@ public class ClientMessagePump implements NetMsgHandler {
int cost = buy.getBaseValue();
if (buy.isID() || buy.isCustomValue())
cost = buy.getMagicValue();
float bargain = sourcePlayer.getBargain();
float bargain = PlayerManager.getBargain(sourcePlayer);
float profit = npc.getSellPercent(sourcePlayer) - bargain;
if (profit < 1)
profit = 1;
@@ -1821,7 +1821,7 @@ public class ClientMessagePump implements NetMsgHandler {
long type = player.getTimeStamp("LastRecallType");
if (type == 1) { //recall to bind
player.teleport(player.getBindLoc());
PlayerManager.teleport(player, player.getBindLoc());
player.setSafeMode();
} else { //recall to rg
float dist = 9999999999f;
@@ -1842,7 +1842,7 @@ public class ClientMessagePump implements NetMsgHandler {
//nearest runegate found. teleport characterTarget
if (rg != null) {
player.teleport(rg.getLoc());
PlayerManager.teleport(player, rg.getLoc());
player.setSafeMode();
}
}
src/engine/net/client/handlers/AcceptInviteToGuildHandler.java
+2 -5
View File
@@ -13,10 +13,7 @@ import engine.Enum;
import engine.Enum.GameObjectType;
import engine.Enum.GuildHistoryType;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.GuildManager;
import engine.gameManager.SessionManager;
import engine.gameManager.*;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -83,7 +80,7 @@ public class AcceptInviteToGuildHandler extends AbstractClientMsgHandler {
player.setGuild(guild);
// Cleanup guild stuff
player.resetGuildStatuses();
PlayerManager.resetGuildStatuses(player);
Dispatch dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java
+1 -1
View File
@@ -53,7 +53,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
GroupManager.RefreshOthersGroupList(player);
}
player.setEnteredWorld(true);
PlayerManager.setEnteredWorld(player, true);
// Set player active
player.resetRegenUpdateTime();
player.setActive(true);
src/engine/net/client/handlers/BanishUnbanishHandler.java
+4 -3
View File
@@ -14,6 +14,7 @@ import engine.Enum.GuildHistoryType;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -55,7 +56,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
boolean success = false;
Guild guild = source.getGuild();
PlayerCharacter realizedTarget = PlayerCharacter.getFromCache(target);
PlayerCharacter realizedTarget = PlayerManager.getFromCache(target);
if (realizedTarget != null) {
// Guild leader can't leave guild. must pass GL or disband
@@ -83,7 +84,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
}
} else {
if (guild.getGuildLeaderUUID() != target) {
PlayerCharacter toBanish = PlayerCharacter.getPlayerCharacter(target);
PlayerCharacter toBanish = PlayerManager.getPlayerCharacter(target);
if (toBanish == null)
return true;
//already added previously.
@@ -110,7 +111,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
//DbManager.GuildQueries.ADD_TO_BANISHED_FROM_GUILDLIST(guild.getobjectUUID(), target);
// Send left guild message to rest of guild
String targetName = PlayerCharacter.getFirstName(target);
String targetName = PlayerManager.getFirstName(target);
ChatManager.chatGuildInfo(guild,
targetName + " has been banished from " + guild.getName() + '.');
GuildListMsg guildListMsg = new GuildListMsg(guild);
src/engine/net/client/handlers/ChangeAltitudeHandler.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.handlers;
import engine.Enum.DispatchChannel;
import engine.exception.MsgSendException;
import engine.gameManager.PlayerManager;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ChangeAltitudeMsg;
@@ -42,7 +43,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
if (!AbstractCharacter.CanFly(pc))
return false;
if (pc.isSwimming())
if (PlayerManager.isSwimming(pc))
return false;
if (pc.region != null && !pc.region.isOutside())
return false;
src/engine/net/client/handlers/ChangeGuildLeaderHandler.java
+7 -6
View File
@@ -14,6 +14,7 @@ import engine.Enum.GameObjectType;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -97,9 +98,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
}
targetPlayer.setGuildLeader(true);
targetPlayer.setInnerCouncil(true);
targetPlayer.setFullMember(true);
PlayerManager.setGuildLeader(targetPlayer, true);
PlayerManager.setInnerCouncil(targetPlayer, true);
PlayerManager.setFullMember(targetPlayer, true);
targetPlayer.incVer();
targetName = targetPlayer.getFirstName();
updateTarget = true;
@@ -113,9 +114,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
//updateOldGuildLeader
sourcePlayer.setInnerCouncil(true);
sourcePlayer.setFullMember(true);
sourcePlayer.setGuildLeader(false);
PlayerManager.setInnerCouncil(sourcePlayer, true);
PlayerManager.setFullMember(sourcePlayer, true);
PlayerManager.setGuildLeader(sourcePlayer, false);
sourcePlayer.incVer();
GuildInfoMsg guildInfoMsg = new GuildInfoMsg(sourcePlayer, sourcePlayer.getGuild(), 2);
src/engine/net/client/handlers/ChangeRankHandler.java
+8 -7
View File
@@ -14,6 +14,7 @@ import engine.Enum.GameObjectType;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -63,14 +64,14 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
if (targetPlayer != null) {
targetPlayer.setGuildTitle(msg.getNewRank());
PlayerManager.setGuildTitle(targetPlayer, msg.getNewRank());
targetName = targetPlayer.getFirstName();
isMale = targetPlayer.getRace().getRaceType().getCharacterSex().equals(Enum.CharacterSex.MALE);
} else {
DbManager.GuildQueries.UPDATE_GUILD_RANK_OFFLINE(msg.getPlayerUUID(), msg.getNewRank(), sourcePlayer.getGuild().getObjectUUID());
targetName = PlayerCharacter.getFirstName(msg.getPlayerUUID());
targetName = PlayerManager.getFirstName(msg.getPlayerUUID());
isMale = true;
}
@@ -98,7 +99,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
taxUpdate = (updateMask & 1) > 0;
if (targetName == null && updateMask > 0)
targetName = PlayerCharacter.getFirstName(msg.getPlayerUUID());
targetName = PlayerManager.getFirstName(msg.getPlayerUUID());
} else {
icUpdate = (GuildStatusController.isInnerCouncil(targetPlayer.getGuildStatus()) != (msg.getIc() > 0)) && GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus());
recruitUpdate = (GuildStatusController.isRecruiter(targetPlayer.getGuildStatus()) != (msg.getRec() > 0)) && GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus());
@@ -106,16 +107,16 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
//This logic branch only executes if targetPlayer has passed a null check...
if (icUpdate) {
targetPlayer.setInnerCouncil(msg.getIc() > 0);
targetPlayer.setFullMember(true);
PlayerManager.setInnerCouncil(targetPlayer, msg.getIc() > 0);
PlayerManager.setFullMember(targetPlayer, true);
targetPlayer.incVer();
}
if (recruitUpdate)
targetPlayer.setRecruiter(msg.getRec() > 0);
PlayerManager.setRecruiter(targetPlayer, msg.getRec() > 0);
if (taxUpdate)
targetPlayer.setTaxCollector(msg.getTax() > 0);
PlayerManager.setTaxCollector(targetPlayer, msg.getTax() > 0);
if (targetName == null)
targetName = targetPlayer.getFirstName();
src/engine/net/client/handlers/DisbandGuildHandler.java
+3 -2
View File
@@ -17,6 +17,7 @@ import engine.db.archive.GuildRecord;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -98,8 +99,8 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
//Save Guild data
player.setGuildLeader(false);
player.setInnerCouncil(false);
PlayerManager.setGuildLeader(player, false);
PlayerManager.setInnerCouncil(player, false);
guild.setGuildLeaderUUID(0);
guild.setNation(null);
src/engine/net/client/handlers/GuildControlHandler.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.handlers;
import engine.Enum;
import engine.exception.MsgSendException;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -60,7 +61,7 @@ public class GuildControlHandler extends AbstractClientMsgHandler {
PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
//If we don't get a valid PC for whatever reason.. just ignore it.
PlayerCharacter pc = PlayerCharacter.getFromCache(msg.getUnknown03());
PlayerCharacter pc = PlayerManager.getFromCache(msg.getUnknown03());
if (pc != null) {
dispatch = Dispatch.borrow(player, new GuildListMsg(pc));
src/engine/net/client/handlers/GuildCreationFinalizeHandler.java
+5 -8
View File
@@ -15,10 +15,7 @@ import engine.Enum.GuildHistoryType;
import engine.Enum.ItemType;
import engine.Enum.OwnerType;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.GuildManager;
import engine.gameManager.SessionManager;
import engine.gameManager.*;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -130,10 +127,10 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
GuildManager.joinGuild(player, newGuild, GuildHistoryType.CREATE);
newGuild.setGuildLeader(player);
player.setGuildLeader(true);
player.setInnerCouncil(true);
player.setFullMember(true);
player.setGuildTitle(charterType.getNumberOfRanks() - 1);
PlayerManager.setGuildLeader(player, true);
PlayerManager.setInnerCouncil(player, true);
PlayerManager.setFullMember(player, true);
PlayerManager.setGuildTitle(player, charterType.getNumberOfRanks() - 1);
player.getCharItemManager().delete(charter);
player.getCharItemManager().updateInventory();
player.incVer();
src/engine/net/client/handlers/GuildInfoHandler.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.handlers;
import engine.Enum.GameObjectType;
import engine.exception.MsgSendException;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -43,7 +44,7 @@ public class GuildInfoHandler extends AbstractClientMsgHandler {
} else if (msg.getMsgType() == 5) {
if (msg.getObjectType() == GameObjectType.PlayerCharacter.ordinal()) {
PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(msg.getObjectID());
PlayerCharacter pc = PlayerManager.getPlayerCharacter(msg.getObjectID());
dispatch = Dispatch.borrow(sourcePlayer, new GuildInfoMsg(pc, pc.getGuild(), 5));
DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
} else {
src/engine/net/client/handlers/MerchantMsgHandler.java
+1 -2
View File
@@ -17,7 +17,6 @@ import engine.powers.PowersBase;
import engine.server.MBServerStatics;
import java.util.ArrayList;
import java.util.Objects;
/*
* @Author:
@@ -347,7 +346,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
JobScheduler.getInstance().scheduleJob(tj, time * 1000);
} else if (joinedGuild) {
player.teleport(teleportLoc);
PlayerManager.teleport(player, teleportLoc);
player.setSafeMode();
}
}
src/engine/net/client/handlers/ObjectActionMsgHandler.java
+1 -1
View File
@@ -417,7 +417,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
if (!toCommand.isSiege())
return true;
if (player.commandSiegeMinion(toCommand)) {
if (PlayerManager.commandSiegeMinion(player, toCommand)) {
itemMan.consume(item);
}
break;
src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java
+4 -3
View File
@@ -6,6 +6,7 @@ import engine.Enum.GameObjectType;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -71,7 +72,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
}
AbstractCharacter toAdd = null;
if (msg.getPlayerType() == GameObjectType.PlayerCharacter.ordinal())
toAdd = PlayerCharacter.getFromCache(msg.getPlayerID());
toAdd = PlayerManager.getFromCache(msg.getPlayerID());
else if (msg.getPlayerType() == GameObjectType.NPC.ordinal())
toAdd = NPC.getFromCache(msg.getPlayerID());
else if (msg.getPlayerType() == GameObjectType.Mob.ordinal())
@@ -214,7 +215,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
if (msg.getPlayerType() != GameObjectType.PlayerCharacter.ordinal())
return true;
PlayerCharacter playerCharacter = PlayerCharacter.getFromCache(msg.getPlayerID());
PlayerCharacter playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
if (playerCharacter == null)
return true;
@@ -303,7 +304,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
//Check to see if the invited is already on the friends list.
switch (msg.getInviteType()) {
case 7:
playerCharacter = PlayerCharacter.getFromCache(msg.getPlayerID());
playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
if (playerCharacter == null)
return true;
if (sourceBuilding.getFriends().containsKey(playerCharacter.getObjectUUID()))
src/engine/net/client/handlers/RequestEnterWorldHandler.java
+3 -2
View File
@@ -8,6 +8,7 @@ import engine.db.archive.CharacterRecord;
import engine.db.archive.DataWarehouse;
import engine.db.archive.PvpRecord;
import engine.exception.MsgSendException;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable;
import engine.net.Dispatch;
@@ -57,7 +58,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
return true;
}
player.setEnteredWorld(false);
PlayerManager.setEnteredWorld(player, false);
Account acc = SessionManager.getAccount(origin);
@@ -118,7 +119,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
try {
if (!player.isAlive()) {
Logger.info("respawning player on enter world.");
player.respawn(true, true, true);
PlayerManager.respawn(player, true, true, true);
}
} catch (Exception e) {
src/engine/net/client/handlers/SwearInHandler.java
+2 -1
View File
@@ -12,6 +12,7 @@ package engine.net.client.handlers;
import engine.Enum;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
@@ -63,7 +64,7 @@ public class SwearInHandler extends AbstractClientMsgHandler {
}
// Swear target in and send message to guild
target.setFullMember(true);
PlayerManager.setFullMember(target, true);
target.incVer();
ChatManager.chatGuildInfo(source, target.getFirstName() + " has been sworn in as a full member!");
src/engine/net/client/handlers/TransferAssetMsgHandler.java
+2 -1
View File
@@ -4,6 +4,7 @@ import engine.Enum;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager;
import engine.gameManager.PlayerManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ErrorPopupMsg;
@@ -35,7 +36,7 @@ public class TransferAssetMsgHandler extends AbstractClientMsgHandler {
int TargetType = transferAssetMsg.getTargetType(); //ToDue later
Building building = BuildingManager.getBuildingFromCache(Buildingid);
PlayerCharacter newOwner = PlayerCharacter.getFromCache(TargetID);
PlayerCharacter newOwner = PlayerManager.getFromCache(TargetID);
PlayerCharacter player = origin.getPlayerCharacter();
if (player == null || building == null || newOwner == null)
src/engine/net/client/msg/ApplyRuneMsg.java
+6 -5
View File
@@ -12,6 +12,7 @@ package engine.net.client.msg;
import engine.Enum;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.net.*;
import engine.net.client.ClientConnection;
import engine.net.client.Protocol;
@@ -381,23 +382,23 @@ public class ApplyRuneMsg extends ClientNetMsg {
//add any additional stats to match old amount
int dif = strTotal - (int) playerCharacter.statStrBase;
if (dif > 0 && strTotal < (int) playerCharacter.statStrMax) {
playerCharacter.addStr(dif);
PlayerManager.addStr(playerCharacter, dif);
}
dif = dexTotal - (int) playerCharacter.statDexBase;
if (dif > 0 && dexTotal < (int) playerCharacter.statDexMax) {
playerCharacter.addDex(dif);
PlayerManager.addDex(playerCharacter, dif);
}
dif = conTotal - (int) playerCharacter.statConBase;
if (dif > 0 && conTotal < (int) playerCharacter.statConMax) {
playerCharacter.addCon(dif);
PlayerManager.addCon(playerCharacter, dif);
}
dif = intTotal - (int) playerCharacter.statIntBase;
if (dif > 0 && intTotal < (int) playerCharacter.statIntMax) {
playerCharacter.addInt(dif);
PlayerManager.addInt(playerCharacter, dif);
}
dif = spiTotal - (int) playerCharacter.statSpiBase;
if (dif > 0 && spiTotal < (int) playerCharacter.statSpiMax) {
playerCharacter.addSpi(dif);
PlayerManager.addSpi(playerCharacter, dif);
}
// recalculate all bonuses/formulas/skills/powers
playerCharacter.recalculate();
src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java
+2 -1
View File
@@ -13,6 +13,7 @@ import engine.Enum.GameObjectType;
import engine.Enum.TransactionType;
import engine.exception.SerializationException;
import engine.gameManager.BuildingManager;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -102,7 +103,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
break;
case PlayerCharacter:
PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(transaction.getTargetUUID());
PlayerCharacter pc = PlayerManager.getPlayerCharacter(transaction.getTargetUUID());
if (pc != null)
name = pc.getCombinedName();
break;
src/engine/net/client/msg/BuyFromNPCWindowMsg.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg;
import engine.Enum.ItemType;
import engine.exception.SerializationException;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.AbstractNetMsg;
import engine.net.ByteBufferReader;
@@ -100,7 +101,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
man = npc.getCharItemManager();
Contract contract = npc.getContract();
if (player != null) {
float barget = player.getBargain();
float barget = PlayerManager.getBargain(player);
float profit = npc.getSellPercent(player) - barget;
if (profit < 1)
src/engine/net/client/msg/IgnoreMsg.java
+4 -3
View File
@@ -12,6 +12,7 @@ package engine.net.client.msg;
import engine.gameManager.ChatManager;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@@ -81,7 +82,7 @@ public class IgnoreMsg extends ClientNetMsg {
}
//FIX THIS, USE OUR CACHE!
PlayerCharacter pcToIgnore = PlayerCharacter.getByFirstName(nameToIgnore);
PlayerCharacter pcToIgnore = PlayerManager.getByFirstName(nameToIgnore);
if (pcSource == null) {
return;
@@ -114,11 +115,11 @@ public class IgnoreMsg extends ClientNetMsg {
pcSource.removeIgnoredPlayer(pcToIgnore.getAccount());
ChatManager.chatSystemInfo(pcSource, "Character " + fn + " is no longer ignored.");
} else {
if (!PlayerCharacter.isIgnorable()) {
if (!PlayerManager.isIgnorable()) {
ChatManager.chatSystemError(pcSource, "This character cannot be ignored.");
return;
}
if (PlayerCharacter.isIgnoreListFull()) {
if (PlayerManager.isIgnoreListFull()) {
ChatManager.chatSystemError(pcSource, "Your ignore list is already full.");
return;
}
src/engine/net/client/msg/OpenFriendsCondemnListMsg.java
+3 -2
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg;
import engine.Enum.GameObjectType;
import engine.gameManager.DbManager;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -619,7 +620,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
writer.putInt(listSize);
for (BuildingFriends friend : this.friends.values()) {
pc = PlayerCharacter.getFromCache(friend.getPlayerUID());
pc = PlayerManager.getFromCache(friend.getPlayerUID());
guild = Guild.getGuild(friend.getGuildUID());
if (friend.getFriendType() == 7) {
if (pc != null)
@@ -718,7 +719,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
AbstractCharacter heraldryCharacter = null;
int characterType = heraldryMap.get(characterID);
if (characterType == GameObjectType.PlayerCharacter.ordinal())
heraldryCharacter = PlayerCharacter.getFromCache(characterID);
heraldryCharacter = PlayerManager.getFromCache(characterID);
else if (characterType == GameObjectType.NPC.ordinal())
heraldryCharacter = NPC.getFromCache(characterID);
else if (characterType == GameObjectType.Mob.ordinal())
src/engine/net/client/msg/RefineMsg.java
+6 -5
View File
@@ -10,6 +10,7 @@
package engine.net.client.msg;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.*;
import engine.net.client.ClientConnection;
@@ -160,15 +161,15 @@ public class RefineMsg extends ClientNetMsg {
private static boolean refineStat(ClientConnection origin, PlayerCharacter pc, int token, RefineMsg msg) {
if (token == MBServerStatics.STAT_STR_ID)
return pc.refineStr();
return PlayerManager.refineStr(pc);
if (token == MBServerStatics.STAT_DEX_ID)
return pc.refineDex();
return PlayerManager.refineDex(pc);
if (token == MBServerStatics.STAT_CON_ID)
return pc.refineCon();
return PlayerManager.refineCon(pc);
if (token == MBServerStatics.STAT_INT_ID)
return pc.refineInt(msg);
return PlayerManager.refineInt(pc, msg);
if (token == MBServerStatics.STAT_SPI_ID)
return pc.refineSpi();
return PlayerManager.refineSpi(pc);
return false;
}
src/engine/net/client/msg/SendOwnPlayerMsg.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.AbstractNetMsg;
import engine.net.ByteBufferReader;
@@ -90,7 +91,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
}
writer.putVector3f(ch.getLoc());
try {
PlayerCharacter.serializeForClientMsgFull(this.ch, writer);
PlayerManager.serializeForClientMsgFull(this.ch, writer);
} catch (SerializationException e) {
Logger.error(e);
}
src/engine/net/client/msg/TerritoryChangeMessage.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg;
import engine.exception.SerializationException;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -64,7 +65,7 @@ public class TerritoryChangeMessage extends ClientNetMsg {
writer.putString(realm.getRealmName());
if (this.realmOwner != null) {
writer.putString(this.realmOwner.getCombinedName());
writer.putInt(PlayerCharacter.GetPlayerRealmTitle(this.realmOwner));
writer.putInt(PlayerManager.GetPlayerRealmTitle(this.realmOwner));
writer.putInt(1);
writer.put((byte) 1);
writer.put((byte) 1);
src/engine/net/client/msg/TrackWindowMsg.java
+3 -2
View File
@@ -10,6 +10,7 @@
package engine.net.client.msg;
import engine.Enum.GameObjectType;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.AbstractNetMsg;
import engine.net.ByteBufferReader;
@@ -89,7 +90,7 @@ public class TrackWindowMsg extends ClientNetMsg {
for (int i = 0; i < size; i++) {
int objectType = reader.getInt();
int objectID = reader.getInt();
this.source = PlayerCharacter.getFromCache(objectID);
this.source = PlayerManager.getFromCache(objectID);
reader.getString(); //name
reader.get(); //always 00?
reader.getInt(); //guildObjectType
@@ -106,7 +107,7 @@ public class TrackWindowMsg extends ClientNetMsg {
//Get the Character from it's Object Type and ID
AbstractCharacter ac = null;
if (objectType == GameObjectType.PlayerCharacter.ordinal())
ac = PlayerCharacter.getFromCache(objectID);
ac = PlayerManager.getFromCache(objectID);
else if (objectType == GameObjectType.NPC.ordinal())
ac = NPC.getFromCache(objectID);
else if (objectType == GameObjectType.Mob.ordinal())
src/engine/net/client/msg/VendorDialogMsg.java
+6 -9
View File
@@ -12,10 +12,7 @@ package engine.net.client.msg;
import engine.Enum.DispatchChannel;
import engine.Enum.GuildHistoryType;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.GuildManager;
import engine.gameManager.SessionManager;
import engine.gameManager.*;
import engine.math.Vector3fImmutable;
import engine.net.*;
import engine.net.client.ClientConnection;
@@ -437,7 +434,7 @@ public class VendorDialogMsg extends ClientNetMsg {
if (level >= minLevel && level <= maxLevel) {
if (useSquare)
loc = getSquare(loc);
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
pc.setSafeMode();
// PowersManager.applyPower(pc, pc, new Vector3f(0f,
// 0f, 0f), -1661758934, 40, false);
@@ -463,7 +460,7 @@ public class VendorDialogMsg extends ClientNetMsg {
// teleport player
if (useSquare)
loc = getSquare(loc);
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
pc.setSafeMode();
// PowersManager.applyPower(pc, pc, new
// Vector3f(0f, 0f, 0f), -1661758934, 40, false);
@@ -471,10 +468,10 @@ public class VendorDialogMsg extends ClientNetMsg {
// join guild
GuildManager.joinGuild(pc, guild, GuildHistoryType.JOIN);
pc.resetGuildStatuses();
PlayerManager.resetGuildStatuses(pc);
if (guild.isNPCGuild())
pc.setFullMember(true);
PlayerManager.setFullMember(pc, true);
if (useSquare)
loc = loc.add(30, 0, 0);
@@ -483,7 +480,7 @@ public class VendorDialogMsg extends ClientNetMsg {
// guild not found, just teleport
if (useSquare)
loc = getSquare(loc);
pc.teleport(loc);
PlayerManager.teleport(pc, loc);
pc.setSafeMode();
// PowersManager.applyPower(pc, pc, new
// Vector3f(0f, 0f, 0f), -1661758934, 50, false);
src/engine/net/client/msg/WhoResponseMsg.java
+3 -2
View File
@@ -10,6 +10,7 @@
package engine.net.client.msg;
import engine.Enum;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.*;
import engine.net.client.ClientConnection;
@@ -233,8 +234,8 @@ public class WhoResponseMsg extends ClientNetMsg {
writer.putInt(pc.getObjectUUID());
writer.putString(pc.getFirstName());
writer.putString(pc.getLastName());
writer.putInt(pc.getRaceToken());
writer.putInt(pc.getClassToken());
writer.putInt(PlayerManager.getRaceToken(pc));
writer.putInt(PlayerManager.getClassToken(pc));
writer.putInt(pc.getLevel());
writer.putInt(0); // unknown 0
writer.putInt(pc.isMale() ? 1 : 2); //gender?
src/engine/net/client/msg/guild/GuildInfoMsg.java
+4 -3
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg.guild;
import engine.Enum.GameObjectType;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
@@ -193,7 +194,7 @@ class GuildInfoMessageType2 extends GuildInfoMessageType {
writer.putString(g.getName());
if (this.objectType == GameObjectType.PlayerCharacter.ordinal()) {
PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
if (pc != null) {
writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
@@ -254,7 +255,7 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
writer.putInt(0);
writer.putInt(0);
writer.putInt(0);
PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
if (this.g == null || pc == null) {
writer.putInt(0);
writer.putInt(0);
@@ -298,7 +299,7 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
if (guildLeader != null)
guildLeaderName = guildLeader.getName();
} else {
guildLeader = PlayerCharacter.getFromCache(g.getGuildLeaderUUID());
guildLeader = PlayerManager.getFromCache(g.getGuildLeaderUUID());
if (guildLeader != null)
guildLeaderName = ((PlayerCharacter) guildLeader).getCombinedName();
}
src/engine/net/client/msg/guild/GuildListMsg.java
+2 -1
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg.guild;
import engine.Enum;
import engine.Enum.GameObjectType;
import engine.gameManager.PlayerManager;
import engine.gameManager.SessionManager;
import engine.net.AbstractConnection;
import engine.net.ByteBufferReader;
@@ -204,7 +205,7 @@ class GuildListMessageType2 extends GuildListMessageType {
writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus())); //Title Maybe?
writer.putInt(GuildStatusController.getRank(pc.getGuildStatus())); //Rank?
writer.putInt(pc.getRaceToken()); //race token
writer.putInt(PlayerManager.getRaceToken(pc)); //race token
writer.putInt(pc.getBaseClassToken()); //class token
writer.putInt(2); //PAD
src/engine/net/client/msg/login/CharSelectScreenMsg.java
+3 -2
View File
@@ -11,6 +11,7 @@ package engine.net.client.msg.login;
import engine.exception.SerializationException;
import engine.gameManager.PlayerManager;
import engine.net.AbstractConnection;
import engine.net.AbstractNetMsg;
import engine.net.ByteBufferReader;
@@ -162,9 +163,9 @@ public class CharSelectScreenMsg extends ClientNetMsg {
for (int i = 0; i < this.numChars; ++i) {
try {
if (!fromCommit)
PlayerCharacter.serializeForClientMsgLogin(this.chars.get(i), writer);
PlayerManager.serializeForClientMsgLogin(this.chars.get(i), writer);
else
PlayerCharacter.serializeForClientMsgCommit(this.chars.get(i), writer);
PlayerManager.serializeForClientMsgCommit(this.chars.get(i), writer);
} catch (SerializationException e) {
Logger.error("failed to serialize character " + this.chars.get(i).getObjectUUID());
// Handled already.