Skip to content

Fix crashes. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Redned235 merged 1 commit into from
Jul 20, 2019
+34 −48
Merged

Fix crashes. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
75 changes: 30 additions & 45 deletions connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import com.flowpowered.math.vector.Vector3f;
import com.flowpowered.math.vector.Vector3i;
import com.github.steveice10.mc.protocol.packet.ingame.server.ServerJoinGamePacket;
import com.nukkitx.nbt.CompoundTagBuilder;
import com.nukkitx.nbt.NbtUtils;
import com.nukkitx.nbt.stream.NBTOutputStream;
import com.nukkitx.nbt.tag.CompoundTag;
Expand All @@ -38,14 +39,33 @@
import com.nukkitx.protocol.bedrock.data.GameRule;
import com.nukkitx.protocol.bedrock.packet.*;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufOutputStream;
import io.netty.buffer.Unpooled;
import org.geysermc.connector.utils.GeyserUtils;
import org.geysermc.connector.utils.Toolbox;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.HashMap;

public class TranslatorsInit {
private static final CompoundTag EMPTY_TAG = CompoundTagBuilder.builder().buildRootTag();
private static final byte[] EMPTY_LEVEL_CHUNK_DATA;

static {
try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
outputStream.write(new byte[258]); // Biomes + Border Size + Extra Data Size

try (NBTOutputStream stream = NbtUtils.createNetworkWriter(outputStream)) {
stream.write(EMPTY_TAG);
}

EMPTY_LEVEL_CHUNK_DATA = outputStream.toByteArray();
}catch (IOException e) {
throw new AssertionError("Unable to generate empty level chunk data");
}
}

public static void start() {
addLoginPackets();
}
Expand All @@ -72,16 +92,16 @@ private static void addLoginPackets() {
startGamePacket.setDifficulty(1);
startGamePacket.setDefaultSpawn(new Vector3i(0, 0, 0));
startGamePacket.setAcheivementsDisabled(true);
startGamePacket.setTime(1300);
startGamePacket.setTime(0);
startGamePacket.setEduLevel(false);
startGamePacket.setEduFeaturesEnabled(false);
startGamePacket.setRainLevel(0);
startGamePacket.setLightningLevel(0);
startGamePacket.setMultiplayerGame(false);
startGamePacket.setMultiplayerGame(true);
startGamePacket.setBroadcastingToLan(true);
startGamePacket.getGamerules().add((new GameRule("showcoordinates", true)));
startGamePacket.setPlatformBroadcastMode(GamePublishSetting.FRIENDS_OF_FRIENDS);
startGamePacket.setXblBroadcastMode(GamePublishSetting.FRIENDS_OF_FRIENDS);
startGamePacket.getGamerules().add(new GameRule<>("showcoordinates", true));
startGamePacket.setPlatformBroadcastMode(GamePublishSetting.PUBLIC);
startGamePacket.setXblBroadcastMode(GamePublishSetting.PUBLIC);
startGamePacket.setCommandsEnabled(true);
startGamePacket.setTexturePacksRequired(false);
startGamePacket.setBonusChestEnabled(false);
Expand All @@ -99,19 +119,13 @@ private static void addLoginPackets() {
startGamePacket.setLevelId("oerjhii");
startGamePacket.setWorldName("world");
startGamePacket.setPremiumWorldTemplateId("00000000-0000-0000-0000-000000000000");
startGamePacket.setCurrentTick(1);
startGamePacket.setEnchantmentSeed(1);
startGamePacket.setCurrentTick(0);
startGamePacket.setEnchantmentSeed(0);
startGamePacket.setMultiplayerCorrelationId("");
startGamePacket.setCachedPalette(Toolbox.CACHED_PALLETE);
startGamePacket.setItemEntries(Toolbox.ITEMS);

session.getUpstream().sendPacketImmediately(startGamePacket);

BiomeDefinitionListPacket biomeDefListPacket = new BiomeDefinitionListPacket();
session.getUpstream().sendPacketImmediately(biomeDefListPacket);

AvailableEntityIdentifiersPacket availableEntityPacket = new AvailableEntityIdentifiersPacket();
session.getUpstream().sendPacketImmediately(availableEntityPacket);
session.getUpstream().sendPacket(startGamePacket);

Vector3f pos = new Vector3f(0, 0, 0);

Expand All @@ -126,38 +140,9 @@ private static void addLoginPackets() {
LevelChunkPacket data = new LevelChunkPacket();
data.setChunkX(chunkX + x);
data.setChunkZ(chunkZ + z);
data.setSubChunksLength(0);

ByteBuf buf = Unpooled.buffer();

data.setSubChunksLength(16);

for(int i = 0; i < 1; i++) {
GeyserUtils.writeEmptySubChunk(buf);
}

for(int i = 0; i < 256; i++) {
buf.writeByte(0);
}

buf.writeZero(1);

VarInts.writeInt(buf, 0);

ByteArrayOutputStream s = new ByteArrayOutputStream();

NBTOutputStream stream = NbtUtils.createNetworkWriter(s);

try {
stream.write(new CompoundTag("", new HashMap<>()));
s.close();
stream.close();
} catch (Exception e) {
e.printStackTrace();
}

buf.writeBytes(s.toByteArray());

data.setData(new byte[0]);
data.setData(EMPTY_LEVEL_CHUNK_DATA);

session.getUpstream().sendPacketImmediately(data);

Expand Down
7 changes: 4 additions & 3 deletions connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@ public class Toolbox {

ByteBuf b = Unpooled.buffer();

VarInts.writeInt(b, entries.size());
VarInts.writeUnsignedInt(b, entries.size());

for (Map<String, Object> e : entries) {
BedrockUtils.writeString(b, (String) e.get("name"));
b.writeShortLE((Integer) e.get("data"));
b.writeShortLE((int) e.get("data"));
b.writeShortLE((int) e.get("id"));
}

CACHED_PALLETE = b;
Expand All @@ -56,7 +57,7 @@ public class Toolbox {
ArrayList<StartGamePacket.ItemEntry> l = new ArrayList<>();

for(HashMap e : s) {
l.add(new StartGamePacket.ItemEntry((String) e.get("name"), ((Integer) e.get("id")).shortValue()));
l.add(new StartGamePacket.ItemEntry((String) e.get("name"), (short) ((int) e.get("id"))));
}

ITEMS = l;
Expand Down