Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity

Small changes

Browse source
This commit is contained in:
AJ Ferguson 2020-02-05 20:23:06 -09:00
parent e4ab4b336c
commit 516fc51162
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
View file

@ -34,6 +34,6 @@ public class BlockTranslator {
} }
public BlockEntry getBlockEntry(String javaIdentifier) { public BlockEntry getBlockEntry(String javaIdentifier) {
return Toolbox.JAVA_IDENTIFIER_TO_ENTRY.get(javaIdentifier); return Toolbox.JAVA_IDENTIFIER_TO_BLOCK_ENTRY.get(javaIdentifier);
} }
} }

4
connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
View file

@ -77,13 +77,13 @@ public class JavaChunkDataTranslator extends PacketTranslator<ServerChunkDataPac
levelChunkPacket.setData(payload); levelChunkPacket.setData(payload);
session.getUpstream().sendPacket(levelChunkPacket); session.getUpstream().sendPacket(levelChunkPacket);
} else { } else {
final int xOffset = packet.getColumn().getX() << 4;
final int zOffset = packet.getColumn().getZ() << 4;
Chunk[] chunks = packet.getColumn().getChunks(); Chunk[] chunks = packet.getColumn().getChunks();
for (int i = 0; i < chunks.length; i++) { for (int i = 0; i < chunks.length; i++) {
Chunk chunk = chunks[i]; Chunk chunk = chunks[i];
if (chunk == null) continue; if (chunk == null) continue;
final int xOffset = packet.getColumn().getX() << 4;
final int yOffset = i * 16; final int yOffset = i * 16;
final int zOffset = packet.getColumn().getZ() << 4;
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int y = 0; y < 16; y++) { for (int y = 0; y < 16; y++) {
for (int z = 0; z < 16; z++) { for (int z = 0; z < 16; z++) {

4
connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
View file

@ -50,7 +50,7 @@ public class Toolbox {
public static final Int2ObjectMap<ItemEntry> ITEM_ENTRIES = new Int2ObjectOpenHashMap<>(); public static final Int2ObjectMap<ItemEntry> ITEM_ENTRIES = new Int2ObjectOpenHashMap<>();
public static final Int2ObjectMap<BlockEntry> BLOCK_ENTRIES = new Int2ObjectOpenHashMap<>(); public static final Int2ObjectMap<BlockEntry> BLOCK_ENTRIES = new Int2ObjectOpenHashMap<>();
public static final Map<String, BlockEntry> JAVA_IDENTIFIER_TO_ENTRY = new HashMap<>(); public static final Map<String, BlockEntry> JAVA_IDENTIFIER_TO_BLOCK_ENTRY = new HashMap<>();
public static void init() { public static void init() {
InputStream stream = GeyserConnector.class.getClassLoader().getResourceAsStream("bedrock/runtime_block_states.dat"); InputStream stream = GeyserConnector.class.getClassLoader().getResourceAsStream("bedrock/runtime_block_states.dat");
@ -141,7 +141,7 @@ public class Toolbox {
} }
BlockEntry blockEntry = new BlockEntry(javaEntry.getKey(), javaIndex, bedrockIndex); BlockEntry blockEntry = new BlockEntry(javaEntry.getKey(), javaIndex, bedrockIndex);
BLOCK_ENTRIES.put(javaIndex, blockEntry); BLOCK_ENTRIES.put(javaIndex, blockEntry);
JAVA_IDENTIFIER_TO_ENTRY.put(javaEntry.getKey(), blockEntry); JAVA_IDENTIFIER_TO_BLOCK_ENTRY.put(javaEntry.getKey(), blockEntry);
continue javaLoop; continue javaLoop;
} }
} }