viewport loading debug info
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
Some checks failed
studiorailgun/Renderer/pipeline/head There was a failure building this commit
This commit is contained in:
parent
54286cd48b
commit
eade09aaa7
@ -57,7 +57,7 @@ public class ViewportLoading {
|
|||||||
try {
|
try {
|
||||||
TimeUnit.MILLISECONDS.sleep(10);
|
TimeUnit.MILLISECONDS.sleep(10);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new Error("Loading thread was interrupted!");
|
throw new Error("Loading thread was interrupted - failed to initialize player!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//add player to viewport realm
|
//add player to viewport realm
|
||||||
@ -76,7 +76,7 @@ public class ViewportLoading {
|
|||||||
try {
|
try {
|
||||||
TimeUnit.MILLISECONDS.sleep(10);
|
TimeUnit.MILLISECONDS.sleep(10);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
throw new Error("Loading thread was interrupted!");
|
throw new Error("Loading thread was interrupted - failed to get world data on client!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -15,12 +15,11 @@ public class AuthProtocol implements ClientProtocolTemplate<AuthMessage> {
|
|||||||
@Override
|
@Override
|
||||||
public AuthMessage handleAsyncMessage(AuthMessage message) {
|
public AuthMessage handleAsyncMessage(AuthMessage message) {
|
||||||
switch(message.getMessageSubtype()){
|
switch(message.getMessageSubtype()){
|
||||||
case AUTHREQUEST:
|
case AUTHREQUEST: {
|
||||||
//Try login
|
//Try login
|
||||||
//TODO: actually get user/pass
|
|
||||||
Globals.clientState.clientConnection.queueOutgoingMessage(AuthMessage.constructAuthDetailsMessage(Globals.clientState.clientUsername,Globals.clientState.clientPassword));
|
Globals.clientState.clientConnection.queueOutgoingMessage(AuthMessage.constructAuthDetailsMessage(Globals.clientState.clientUsername,Globals.clientState.clientPassword));
|
||||||
break;
|
} break;
|
||||||
case AUTHSUCCESS:
|
case AUTHSUCCESS: {
|
||||||
//clean password hash from memory
|
//clean password hash from memory
|
||||||
Globals.clientState.clientPassword = "";
|
Globals.clientState.clientPassword = "";
|
||||||
//request playable races
|
//request playable races
|
||||||
@ -29,15 +28,15 @@ public class AuthProtocol implements ClientProtocolTemplate<AuthMessage> {
|
|||||||
Globals.clientState.clientConnection.queueOutgoingMessage(CharacterMessage.constructRequestCharacterListMessage());
|
Globals.clientState.clientConnection.queueOutgoingMessage(CharacterMessage.constructRequestCharacterListMessage());
|
||||||
//log that we succeeded
|
//log that we succeeded
|
||||||
LoggerInterface.loggerAuth.INFO("Successfully logged in");
|
LoggerInterface.loggerAuth.INFO("Successfully logged in");
|
||||||
break;
|
} break;
|
||||||
case AUTHFAILURE:
|
case AUTHFAILURE: {
|
||||||
//TODO: handle better
|
//TODO: handle better
|
||||||
LoggerInterface.loggerAuth.ERROR("Auth failure",new Exception("Auth failure"));
|
LoggerInterface.loggerAuth.ERROR("Auth failure",new Exception("Auth failure"));
|
||||||
break;
|
} break;
|
||||||
//ignore stack
|
//ignore stack
|
||||||
case AUTHDETAILS:
|
case AUTHDETAILS: {
|
||||||
//silently ignore
|
//silently ignore
|
||||||
break;
|
} break;
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,10 +20,19 @@ public class PlayerManager {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Registers a player
|
||||||
|
* @param player The player
|
||||||
|
*/
|
||||||
public void registerPlayer(Player player){
|
public void registerPlayer(Player player){
|
||||||
idMap.put(player.getId(),player);
|
idMap.put(player.getId(),player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets a player by their id
|
||||||
|
* @param id The id of the player
|
||||||
|
* @return The player if it exists, null otherwise
|
||||||
|
*/
|
||||||
public Player getPlayerFromId(int id){
|
public Player getPlayerFromId(int id){
|
||||||
return idMap.get(id);
|
return idMap.get(id);
|
||||||
}
|
}
|
||||||
@ -39,6 +48,10 @@ public class PlayerManager {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the list of all players
|
||||||
|
* @return The list of all players
|
||||||
|
*/
|
||||||
public List<Player> getPlayers(){
|
public List<Player> getPlayers(){
|
||||||
List<Player> rVal = new LinkedList<Player>();
|
List<Player> rVal = new LinkedList<Player>();
|
||||||
if(idMap != null && idMap.size() > 0){
|
if(idMap != null && idMap.size() > 0){
|
||||||
|
|||||||
@ -73,7 +73,7 @@ public class ServerState {
|
|||||||
/**
|
/**
|
||||||
* Player manager
|
* Player manager
|
||||||
*/
|
*/
|
||||||
public PlayerManager playerManager = new PlayerManager();
|
public final PlayerManager playerManager = new PlayerManager();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Database controller
|
* Database controller
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user