Merge pull request #923 from Smart123s/feature/floodgate/extensions

Bump Geyser version to 2.1.0-SNAPSHOT
This commit is contained in:
games647
2022-09-22 10:40:24 +02:00
committed by GitHub
5 changed files with 19 additions and 14 deletions

View File

@ -245,7 +245,7 @@
<!-- Bedrock player bridge -->
<dependency>
<groupId>org.geysermc</groupId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>core</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
@ -259,8 +259,8 @@
<!-- We need the API, but it was excluded above -->
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>geyser-api</artifactId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>api</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
</dependency>

View File

@ -186,7 +186,7 @@
<!-- Bedrock player bridge -->
<dependency>
<groupId>org.geysermc</groupId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>core</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
@ -200,8 +200,8 @@
<!-- We need the API, but it was excluded above -->
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>geyser-api</artifactId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>api</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
</dependency>

View File

@ -56,7 +56,7 @@
<!-- Floodgate -->
<repository>
<id>opencollab-snapshot</id>
<url>https://repo.opencollab.dev/maven-snapshots/</url>
<url>https://repo.opencollab.dev/artifactory/maven-snapshots/</url>
<releases>
<enabled>false</enabled>
</releases>
@ -121,7 +121,7 @@
<!-- Bedrock player bridge -->
<dependency>
<groupId>org.geysermc</groupId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>core</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
@ -135,8 +135,8 @@
<!-- We need the API, but it was excluded above -->
<dependency>
<groupId>org.geysermc</groupId>
<artifactId>geyser-api</artifactId>
<groupId>org.geysermc.geyser</groupId>
<artifactId>api</artifactId>
<version>${geyser.version}</version>
<scope>provided</scope>
</dependency>

View File

@ -31,8 +31,8 @@ import com.github.games647.fastlogin.core.shared.LoginSource;
import java.util.UUID;
import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.network.AuthType;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.auth.AuthType;
public class GeyserService extends BedrockService<GeyserSession> {
@ -44,7 +44,7 @@ public class GeyserService extends BedrockService<GeyserSession> {
super(core);
this.geyser = geyser;
this.core = core;
this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType();
this.authType = GeyserImpl.getInstance().getConfig().getRemote().authType();
}
@Override
@ -65,7 +65,12 @@ public class GeyserService extends BedrockService<GeyserSession> {
@Override
public GeyserSession getBedrockPlayer(String username) {
return geyser.connectionByName(username);
for (GeyserSession gSess : geyser.getSessionManager().getAllSessions()) {
if (username.equals(gSess.getClientData().getUsername())) {
return gSess;
}
}
return null;
}
@Override

View File

@ -56,7 +56,7 @@
<maven.compiler.release>${java.version}</maven.compiler.release>
<floodgate.version>2.2.0-SNAPSHOT</floodgate.version>
<geyser.version>2.0.6-SNAPSHOT</geyser.version>
<geyser.version>2.1.0-SNAPSHOT</geyser.version>
</properties>
<modules>