fix: fixed problems arising from Gamelib refactor
This commit is contained in:
parent
cb1f99814a
commit
30a8a03eb2
2
Gamelib
2
Gamelib
@ -1 +1 @@
|
||||
Subproject commit 0572450ced119f18a11363e02356d9afe1d880a7
|
||||
Subproject commit 19f6695ba8f25fcd8223eec3bf350ff67ae5399d
|
@ -0,0 +1,9 @@
|
||||
package uulm.teamname.marvelous.server;
|
||||
|
||||
/** Specifies a participant type. */
|
||||
public enum ParticipantType {
|
||||
None,
|
||||
Player1,
|
||||
Player2,
|
||||
Spectator
|
||||
}
|
@ -4,12 +4,11 @@ import uulm.teamname.marvelous.gamelibrary.IntVector2;
|
||||
import uulm.teamname.marvelous.gamelibrary.events.Event;
|
||||
import uulm.teamname.marvelous.gamelibrary.events.EventBuilder;
|
||||
import uulm.teamname.marvelous.gamelibrary.events.EventType;
|
||||
import uulm.teamname.marvelous.gamelibrary.gamelogic.EventObserver;
|
||||
import uulm.teamname.marvelous.gamelibrary.gamelogic.GameInstance;
|
||||
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;
|
||||
import uulm.teamname.marvelous.gamelibrary.json.config.CharacterConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.json.config.PartyConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.json.config.ScenarioConfig;
|
||||
import uulm.teamname.marvelous.server.ParticipantType;
|
||||
import uulm.teamname.marvelous.gamelibrary.config.CharacterConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.config.PartyConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.config.ScenarioConfig;
|
||||
import uulm.teamname.marvelous.gamelibrary.requests.Request;
|
||||
import uulm.teamname.marvelous.gamelibrary.requests.RequestType;
|
||||
import uulm.teamname.marvelous.server.lobby.pipelining.*;
|
||||
|
@ -1,7 +1,7 @@
|
||||
package uulm.teamname.marvelous.server.lobby.pipelining;
|
||||
|
||||
import uulm.teamname.marvelous.gamelibrary.events.Event;
|
||||
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;
|
||||
import uulm.teamname.marvelous.server.ParticipantType;
|
||||
import uulm.teamname.marvelous.gamelibrary.requests.RequestType;
|
||||
import uulm.teamname.marvelous.server.lobby.Lobby;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
package uulm.teamname.marvelous.server.lobbymanager;
|
||||
|
||||
import org.java_websocket.WebSocket;
|
||||
import uulm.teamname.marvelous.gamelibrary.gamelogic.ParticipantType;
|
||||
import uulm.teamname.marvelous.server.ParticipantType;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user