git-mirrors/GeyserConnect
1
0
Fork 1
mirror of https://github.com/GeyserMC/GeyserConnect.git synced 2025-06-26 14:15:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update for 1.16.210

Browse source
This commit is contained in:
Camotoy 2021-03-09 13:25:29 -05:00
parent c73714c9b4
commit 61bcc6a75d
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
5 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pom.xml
View file

@ -71,11 +71,10 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.github.CloudburstMC.Protocol</groupId> <groupId>com.github.CloudburstMC.Protocol</groupId>
<artifactId>bedrock-v422</artifactId> <artifactId>bedrock-v428</artifactId>
<version>294e7e53b6</version> <version>42da92f</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<!-- Stay on the older version of Network while it's rewritten -->
<exclusion> <exclusion>
<groupId>com.nukkitx.network</groupId> <groupId>com.nukkitx.network</groupId>
<artifactId>raknet</artifactId> <artifactId>raknet</artifactId>
@ -85,7 +84,7 @@
<dependency> <dependency>
<groupId>com.nukkitx.network</groupId> <groupId>com.nukkitx.network</groupId>
<artifactId>raknet</artifactId> <artifactId>raknet</artifactId>
<version>1.6.20</version> <version>1.6.26-20210217.205834-2</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

2
src/main/java/org/geysermc/connect/GeyserConnectConfig.java
View file

@ -52,6 +52,8 @@ public class GeyserConnectConfig {
private String motd; private String motd;
private String submotd = "GeyserConnect";
@JsonProperty("welcome-file") @JsonProperty("welcome-file")
private String welcomeFile = "welcome.txt"; private String welcomeFile = "welcome.txt";

9
src/main/java/org/geysermc/connect/MasterServer.java
View file

@ -157,15 +157,22 @@ public class MasterServer {
if (GeyserConnector.getInstance() != null) { if (GeyserConnector.getInstance() != null) {
playerCount += GeyserConnector.getInstance().getPlayers().size(); playerCount += GeyserConnector.getInstance().getPlayers().size();
} }
String subMotd = geyserConnectConfig.getSubmotd();
if (subMotd == null || subMotd.isEmpty()) {
subMotd = "GeyserConnect";
}
BedrockPong bdPong = new BedrockPong(); BedrockPong bdPong = new BedrockPong();
bdPong.setEdition("MCPE"); bdPong.setEdition("MCPE");
bdPong.setMotd(geyserConnectConfig.getMotd()); bdPong.setMotd(geyserConnectConfig.getMotd());
bdPong.setSubMotd(subMotd);
bdPong.setPlayerCount(playerCount); bdPong.setPlayerCount(playerCount);
bdPong.setMaximumPlayerCount(geyserConnectConfig.getMaxPlayers()); bdPong.setMaximumPlayerCount(geyserConnectConfig.getMaxPlayers());
bdPong.setGameType("Survival"); bdPong.setGameType("Survival");
bdPong.setIpv4Port(port); bdPong.setIpv4Port(port);
bdPong.setProtocolVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion()); bdPong.setProtocolVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getProtocolVersion());
bdPong.setVersion(null); // Server tries to connect either way and it looks better bdPong.setVersion(BedrockProtocol.DEFAULT_BEDROCK_CODEC.getMinecraftVersion());
return bdPong; return bdPong;
} }

7
src/main/java/org/geysermc/connect/utils/Player.java
View file

@ -134,6 +134,13 @@ public class Player {
startGamePacket.setEnchantmentSeed(0); startGamePacket.setEnchantmentSeed(0);
startGamePacket.setMultiplayerCorrelationId(""); startGamePacket.setMultiplayerCorrelationId("");
startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT); startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT);
SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
settings.setRewindHistorySize(0);
settings.setServerAuthoritativeBlockBreaking(false);
startGamePacket.setPlayerMovementSettings(settings);
startGamePacket.setVanillaVersion("*"); startGamePacket.setVanillaVersion("*");
session.sendPacket(startGamePacket); session.sendPacket(startGamePacket);

2
src/main/resources/config.yml
View file

@ -19,6 +19,8 @@ max-players: 100
# MOTD to display # MOTD to display
motd: "GeyserConnect Proxy" motd: "GeyserConnect Proxy"
#Sub-MOTD to display. Will be "GeyserConnect" by default if left blank
submotd: "GeyserConnect"
# Welcome message file, if file exists and is not empty this will show on join # Welcome message file, if file exists and is not empty this will show on join
# This is loaded live so will update without a server restart # This is loaded live so will update without a server restart