Merge remote-tracking branch 'origin/master' into server-language-processing

This commit is contained in:
rtm516 2020-04-09 16:56:14 +01:00
commit 64e0af48f9
2 changed files with 7 additions and 4 deletions

View file

@ -120,6 +120,9 @@
<transformers> <transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.geysermc.platform.standalone.GeyserBootstrap</mainClass> <mainClass>org.geysermc.platform.standalone.GeyserBootstrap</mainClass>
<manifestEntries>
<Multi-Release>true</Multi-Release>
</manifestEntries>
</transformer> </transformer>
<transformer <transformer
implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer"> implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer">
@ -130,4 +133,4 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</project> </project>

View file

@ -63,7 +63,7 @@ public class GeyserConnector {
public static final String NAME = "Geyser"; public static final String NAME = "Geyser";
public static final String VERSION = "1.0-SNAPSHOT"; public static final String VERSION = "1.0-SNAPSHOT";
private final Map<UUID, GeyserSession> players = new HashMap<>(); private final Map<InetSocketAddress, GeyserSession> players = new HashMap<>();
private static GeyserConnector instance; private static GeyserConnector instance;
@ -189,11 +189,11 @@ public class GeyserConnector {
} }
public void addPlayer(GeyserSession player) { public void addPlayer(GeyserSession player) {
players.put(player.getAuthData().getUUID(), player); players.put(player.getSocketAddress(), player);
} }
public void removePlayer(GeyserSession player) { public void removePlayer(GeyserSession player) {
players.remove(player.getAuthData().getUUID()); players.remove(player.getSocketAddress());
} }
public static GeyserConnector start(PlatformType platformType, IGeyserBootstrap bootstrap) { public static GeyserConnector start(PlatformType platformType, IGeyserBootstrap bootstrap) {