feedc0de/FastLogin
1
0
Fork 0
forked from TuxCoding/FastLogin
Code Pull Requests Activity

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

Browse Source 
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
parent 7425df86b5 2fae5060dc
commit 84bfce9f84
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/pom.xml
View File

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

6
bungee/pom.xml
View File

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

8
core/pom.xml
View File

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

11
core/src/main/java/com/github/games647/fastlogin/core/hooks/bedrock/GeyserService.java
View File

@ -31,8 +31,8 @@ import com.github.games647.fastlogin.core.shared.LoginSource;
import java.util.UUID; import java.util.UUID;
import org.geysermc.geyser.GeyserImpl; import org.geysermc.geyser.GeyserImpl;
import org.geysermc.geyser.api.network.AuthType;
import org.geysermc.geyser.session.GeyserSession; import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.session.auth.AuthType;
public class GeyserService extends BedrockService<GeyserSession> { public class GeyserService extends BedrockService<GeyserSession> {
@ -44,7 +44,7 @@ public class GeyserService extends BedrockService<GeyserSession> {
super(core); super(core);
this.geyser = geyser; this.geyser = geyser;
this.core = core; this.core = core;
this.authType = GeyserImpl.getInstance().getConfig().getRemote().getAuthType(); this.authType = GeyserImpl.getInstance().getConfig().getRemote().authType();
} }
@Override @Override
@ -65,7 +65,12 @@ public class GeyserService extends BedrockService<GeyserSession> {
@Override @Override
public GeyserSession getBedrockPlayer(String username) { 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 @Override

2
pom.xml
View File

@ -56,7 +56,7 @@
<maven.compiler.release>${java.version}</maven.compiler.release> <maven.compiler.release>${java.version}</maven.compiler.release>
<floodgate.version>2.2.0-SNAPSHOT</floodgate.version> <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> </properties>
<modules> <modules>