Skip to content

Commit 835ba9e

Browse files
committed
Remove casting from block mappings
1 parent ca2312c commit 835ba9e

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

core/src/main/java/org/geysermc/geyser/registry/type/BlockMappings.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
@Builder
4646
@Value
47-
public class BlockMappings implements DefinitionRegistry<GeyserBedrockBlock> {
47+
public class BlockMappings implements DefinitionRegistry<BlockDefinition> {
4848
GeyserBedrockBlock bedrockAir;
4949
BlockDefinition bedrockWater;
5050
BlockDefinition bedrockMovingBlock;
@@ -134,7 +134,7 @@ public BlockDefinition getStructureBlockFromMode(String mode) {
134134
}
135135

136136
@Override
137-
public boolean isRegistered(GeyserBedrockBlock bedrockBlock) {
137+
public boolean isRegistered(BlockDefinition bedrockBlock) {
138138
return getDefinition(bedrockBlock.getRuntimeId()) == bedrockBlock;
139139
}
140140
}

core/src/main/java/org/geysermc/geyser/session/GeyserSession.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import org.cloudburstmc.protocol.bedrock.data.entity.EntityFlag;
5858
import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
5959
import org.cloudburstmc.protocol.bedrock.packet.*;
60-
import org.cloudburstmc.protocol.common.DefinitionRegistry;
6160
import org.cloudburstmc.protocol.common.util.OptionalBoolean;
6261
import org.geysermc.api.util.BedrockPlatform;
6362
import org.geysermc.api.util.InputMode;
@@ -1466,7 +1465,7 @@ public void sendForm(org.geysermc.cumulus.util.FormBuilder<?, ?> formBuilder) {
14661465

14671466
private void startGame() {
14681467
this.upstream.getCodecHelper().setItemDefinitions(this.itemMappings);
1469-
this.upstream.getCodecHelper().setBlockDefinitions((DefinitionRegistry) this.blockMappings); //FIXME
1468+
this.upstream.getCodecHelper().setBlockDefinitions(this.blockMappings);
14701469
this.upstream.getCodecHelper().setCameraPresetDefinitions(CameraDefinitions.CAMERA_DEFINITIONS);
14711470

14721471
StartGamePacket startGamePacket = new StartGamePacket();

0 commit comments

Comments
 (0)