summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew <pugmatt@gmail.com>2020-11-17 13:09:04 -0500
committerGitHub <noreply@github.com>2020-11-17 13:09:04 -0500
commit5e482f507af8a25951303ae89350c421d7da6085 (patch)
tree21dfcdb01827bbd6abc34ab423ce836172bba496
parentc76f702f9b8312f4b186dc1080940e421c9d74e2 (diff)
parenta2ac4dbce34c0eafaed7a25237a82785c8d0d604 (diff)
downloadBedrockConnect-1.5.5.tar.gz
BedrockConnect-1.5.5.tar.bz2
BedrockConnect-1.5.5.zip
Merge pull request #103 from DoctorMacc/feature/1.16.1001.5.5
Update to 1.16.100
-rw-r--r--serverlist-server/pom.xml2
-rw-r--r--serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java8
-rw-r--r--serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java3
3 files changed, 10 insertions, 3 deletions
diff --git a/serverlist-server/pom.xml b/serverlist-server/pom.xml
index 33def55..0137fad 100644
--- a/serverlist-server/pom.xml
+++ b/serverlist-server/pom.xml
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>com.nukkitx.protocol</groupId>
- <artifactId>bedrock-v408</artifactId>
+ <artifactId>bedrock-v419</artifactId>
<version>2.6.0-SNAPSHOT</version>
<scope>compile</scope>
<exclusions>
diff --git a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
index 26810b2..f69d5f4 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/PipePlayer.java
@@ -11,6 +11,7 @@ import com.nukkitx.protocol.bedrock.BedrockPacket;
import com.nukkitx.protocol.bedrock.BedrockServerSession;
import com.nukkitx.protocol.bedrock.data.*;
import com.nukkitx.protocol.bedrock.data.inventory.ContainerId;
+import com.nukkitx.protocol.bedrock.data.inventory.ItemData;
import com.nukkitx.protocol.bedrock.packet.*;
import com.nukkitx.math.vector.Vector3f;
import main.com.pyratron.pugmatt.bedrockconnect.gui.UIComponents;
@@ -145,7 +146,7 @@ public class PipePlayer {
startGamePacket.setWorldTemplateOptionLocked(false);
//startGamePacket.setOnlySpawningV1Villagers(false);
- //startGamePacket.setMovementServerAuthoritative(false);
+ startGamePacket.setAuthoritativeMovementMode(AuthoritativeMovementMode.CLIENT);
//startGamePacket.setTrial(false);
startGamePacket.setVanillaVersion("*");
@@ -161,6 +162,11 @@ public class PipePlayer {
session.sendPacket(startGamePacket);
+ // Required to be sent for 1.16.100
+ CreativeContentPacket creativeContentPacket = new CreativeContentPacket();
+ creativeContentPacket.setContents(new ItemData[0]);
+ session.sendPacket(creativeContentPacket);
+
spawn();
}
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 fc18353..508c1aa 100644
--- a/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java
+++ b/serverlist-server/src/main/com/pyratron/pugmatt/bedrockconnect/Server.java
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
import com.nukkitx.protocol.bedrock.*;
import com.nukkitx.protocol.bedrock.v408.Bedrock_v408;
+import com.nukkitx.protocol.bedrock.v419.Bedrock_v419;
import main.com.pyratron.pugmatt.bedrockconnect.listeners.PacketHandler;
import main.com.pyratron.pugmatt.bedrockconnect.sql.Data;
@@ -74,7 +75,7 @@ public class Server {
players = new ArrayList<>();
InetSocketAddress bindAddress = new InetSocketAddress("0.0.0.0", Integer.parseInt(port));
- codec = Bedrock_v408.V408_CODEC;
+ codec = Bedrock_v419.V419_CODEC;
server = new BedrockServer(bindAddress);
pong = new BedrockPong();
pong.setEdition("MCPE");