Project cleanup pre merge.

This commit is contained in:
2023-07-15 09:23:48 -04:00
parent 134b651df8
commit 9bbdef224d
747 changed files with 99704 additions and 101200 deletions
+40 -40
View File
@@ -7,7 +7,7 @@
// www.magicbane.com
package engine.session;
package engine.session;
import engine.Enum;
import engine.gameManager.DbManager;
@@ -18,54 +18,54 @@ import engine.objects.PlayerCharacter;
public class Session {
private SessionID sessionID;
private PlayerCharacter playerCharacter;
private Account account;
private ClientConnection conn;
private SessionID sessionID;
private PlayerCharacter playerCharacter;
private Account account;
private ClientConnection conn;
public Session(SessionID sessionID, Account acc, ClientConnection conn) {
super();
this.sessionID = sessionID;
this.playerCharacter = null;
this.account = acc;
this.conn = conn;
}
public Session(SessionID sessionID, Account acc, ClientConnection conn) {
super();
this.sessionID = sessionID;
this.playerCharacter = null;
this.account = acc;
this.conn = conn;
}
public PlayerCharacter getPlayerCharacter() {
if (this.playerCharacter != null) {
public PlayerCharacter getPlayerCharacter() {
if (this.playerCharacter != null) {
if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, this.playerCharacter.getObjectUUID()))
this.playerCharacter = (PlayerCharacter) DbManager.getFromCache(Enum.GameObjectType.PlayerCharacter, this.playerCharacter.getObjectUUID());
}
return this.playerCharacter;
}
if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, this.playerCharacter.getObjectUUID()))
this.playerCharacter = (PlayerCharacter) DbManager.getFromCache(Enum.GameObjectType.PlayerCharacter, this.playerCharacter.getObjectUUID());
}
return this.playerCharacter;
}
public void setPlayerCharacter(PlayerCharacter pc) {
this.playerCharacter = pc;
}
public void setPlayerCharacter(PlayerCharacter pc) {
this.playerCharacter = pc;
}
public SessionID getSessionID() {
return this.sessionID;
}
public SessionID getSessionID() {
return this.sessionID;
}
public void setSessionID(SessionID sessionID) {
this.sessionID = sessionID;
}
public void setSessionID(SessionID sessionID) {
this.sessionID = sessionID;
}
public Account getAccount() {
return this.account;
}
public Account getAccount() {
return this.account;
}
public void setAccount(Account acc) {
this.account = acc;
}
public void setAccount(Account acc) {
this.account = acc;
}
public ClientConnection getConn() {
return this.conn;
}
public ClientConnection getConn() {
return this.conn;
}
public void setConn(ClientConnection conn) {
this.conn = conn;
}
public void setConn(ClientConnection conn) {
this.conn = conn;
}
}