Skip to content

Commit 13d2731

Browse files
Move useless calls to official static method
1 parent 6c60d3b commit 13d2731

File tree

3 files changed

+4
-55
lines changed

3 files changed

+4
-55
lines changed

server/src/main/java/com/soulfiremc/server/plugins/POVServer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import com.soulfiremc.server.protocol.BotConnection;
3030
import com.soulfiremc.server.protocol.BuiltInKnownPackRegistry;
3131
import com.soulfiremc.server.protocol.SFProtocolConstants;
32-
import com.soulfiremc.server.protocol.SFProtocolHelper;
3332
import com.soulfiremc.server.protocol.bot.container.ContainerSlot;
3433
import com.soulfiremc.server.protocol.bot.model.ChunkKey;
3534
import com.soulfiremc.server.protocol.bot.state.LevelHeightAccessor;
@@ -438,7 +437,7 @@ private static void syncBotAndUser(BotConnection botConnection, Session clientSe
438437
var buf = Unpooled.buffer();
439438

440439
for (var i = 0; i < chunk.getSectionCount(); i++) {
441-
SFProtocolHelper.writeChunkSection(buf, chunk.getSection(i));
440+
MinecraftTypes.writeChunkSection(buf, chunk.getSection(i));
442441
}
443442

444443
var chunkBytes = new byte[buf.readableBytes()];
@@ -735,7 +734,7 @@ public int getMinY() {
735734
chunk.set(0, 0, 0, 0);
736735
var biome = DataPalette.createForBiome();
737736
biome.set(0, 0, 0, 0);
738-
SFProtocolHelper.writeChunkSection(buf, new ChunkSection(0, chunk, biome));
737+
MinecraftTypes.writeChunkSection(buf, new ChunkSection(0, chunk, biome));
739738
}
740739

741740
var chunkBytes = new byte[buf.readableBytes()];

server/src/main/java/com/soulfiremc/server/protocol/SFProtocolHelper.java

Lines changed: 0 additions & 44 deletions
This file was deleted.

server/src/main/java/com/soulfiremc/server/protocol/bot/SessionDataManager.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.soulfiremc.server.protocol.BotConnection;
2727
import com.soulfiremc.server.protocol.BuiltInKnownPackRegistry;
2828
import com.soulfiremc.server.protocol.SFProtocolConstants;
29-
import com.soulfiremc.server.protocol.SFProtocolHelper;
3029
import com.soulfiremc.server.protocol.bot.container.SFItemStack;
3130
import com.soulfiremc.server.protocol.bot.container.WindowContainer;
3231
import com.soulfiremc.server.protocol.bot.model.ChunkKey;
@@ -100,7 +99,6 @@
10099
import org.jetbrains.annotations.Nullable;
101100
import org.slf4j.Logger;
102101

103-
import java.io.IOException;
104102
import java.net.MalformedURLException;
105103
import java.net.URI;
106104
import java.util.*;
@@ -782,12 +780,8 @@ public void onChunkData(ClientboundLevelChunkWithLightPacket packet) {
782780

783781
var chunkData = level.chunks().getOrCreateChunkSection(packet.getX(), packet.getZ());
784782

785-
try {
786-
for (var i = 0; i < chunkData.getSectionCount(); i++) {
787-
chunkData.setSection(i, SFProtocolHelper.readChunkSection(buf));
788-
}
789-
} catch (IOException e) {
790-
log.error("Failed to read chunk section", e);
783+
for (var i = 0; i < chunkData.getSectionCount(); i++) {
784+
chunkData.setSection(i, MinecraftTypes.readChunkSection(buf));
791785
}
792786
}
793787

0 commit comments

Comments
 (0)