summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew <pugmatt@gmail.com>2021-03-10 00:30:29 -0500
committerGitHub <noreply@github.com>2021-03-10 00:30:29 -0500
commitdeeccfb15a87f2f57e3cc0a29f7fafe2318703c5 (patch)
treecd3b9d351fb48bba5c9bb15f6ce8b0528779ec4a
parentd7bac8f970b6364c814f2d6e14c715ec19a41614 (diff)
parentd687ce5b1b709d4593b6a32444f356feb22b6d5f (diff)
downloadBedrockConnect-1.6.3.tar.gz
BedrockConnect-1.6.3.tar.bz2
BedrockConnect-1.6.3.zip
Merge pull request #166 from Camotoy/feature/1.16.2101.6.3
Update for 1.16.210
-rw-r--r--serverlist-server/pom.xml23
-rw-r--r--serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java5
-rw-r--r--serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java4
3 files changed, 15 insertions, 17 deletions
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index 723d09d..f210b69 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -58,30 +58,23 @@
</plugins>
</build>
- <!-- <repositories>
- <repository>
- <id>nukkitx-repo</id>
- <url>https://repo.nukkitx.com/snapshot/</url>
- </repository>
- </repositories> -->
-
<repositories>
<repository>
- <id>nukkitx-repo</id>
- <url>https://repo.nukkitx.com/snapshot</url>
+ <id>opencollab-repo</id>
+ <url>https://repo.opencollab.dev/snapshot</url>
</repository>
</repositories>
<distributionManagement>
<repository>
<id>releases</id>
- <name>nukkitx-releases</name>
- <url>https://repo.nukkitx.com/maven-releases</url>
+ <name>opencollab-releases</name>
+ <url>https://repo.opencollab.dev/maven-releases</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
- <name>nukkitx-snapshots</name>
- <url>https://repo.nukkitx.com/maven-snapshots</url>
+ <name>opencollab-snapshots</name>
+ <url>https://repo.opencollab.dev/maven-snapshots</url>
</snapshotRepository>
</distributionManagement>
@@ -94,8 +87,8 @@
</dependency>
<dependency>
<groupId>com.nukkitx.protocol</groupId>
- <artifactId>bedrock-v422</artifactId>
- <version>2.6.1-SNAPSHOT</version>
+ <artifactId>bedrock-v428</artifactId>
+ <version>2.6.2-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
<exclusion>
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
index 919491a..da6d47e 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/BCPlayer.java
@@ -210,6 +210,11 @@ public class BCPlayer {
//startGamePacket.setOnlySpawningV1Villagers(false);
startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT);
+ SyncedPlayerMovementSettings settings = new SyncedPlayerMovementSettings();
+ settings.setMovementMode(AuthoritativeMovementMode.CLIENT);
+ settings.setRewindHistorySize(0);
+ settings.setServerAuthoritativeBlockBreaking(false);
+ startGamePacket.setPlayerMovementSettings(settings);
//startGamePacket.setTrial(false);
startGamePacket.setVanillaVersion("*");
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java
index e917481..e2a2b41 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
import com.nukkitx.protocol.bedrock.*;
-import com.nukkitx.protocol.bedrock.v422.Bedrock_v422;
+import com.nukkitx.protocol.bedrock.v428.Bedrock_v428;
import main.com.pyratron.pugmatt.bedrockconnect.listeners.PacketHandler;
@@ -63,7 +63,7 @@ public class Server {
players = new ArrayList<>();
InetSocketAddress bindAddress = new InetSocketAddress("0.0.0.0", Integer.parseInt(port));
- codec = Bedrock_v422.V422_CODEC;
+ codec = Bedrock_v428.V428_CODEC;
server = new BedrockServer(bindAddress);
pong = new BedrockPong();
pong.setEdition("MCPE");