Skip to content

Commit de66238

Browse files
committed
cleanup network packet
1 parent d8cd59b commit de66238

1 file changed

Lines changed: 14 additions & 17 deletions

File tree

‎src/main/java/de/srendi/advancedperipherals/common/network/toserver/OverlayModuleClientInfoPacket.java‎

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayModule;
88
import net.minecraft.network.RegistryFriendlyByteBuf;
99
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
10-
import net.minecraft.server.MinecraftServer;
1110
import net.minecraft.server.level.ServerPlayer;
1211
import net.minecraft.world.item.ItemStack;
1312
import net.neoforged.neoforge.network.handling.IPayloadContext;
14-
import net.neoforged.neoforge.server.ServerLifecycleHooks;
1513

1614
import java.util.UUID;
1715

@@ -40,24 +38,23 @@ public OverlayModuleClientInfoPacket(RegistryFriendlyByteBuf buffer) {
4038

4139
@Override
4240
public void handle(IPayloadContext context) {
43-
MinecraftServer server = ServerLifecycleHooks.getCurrentServer();
44-
45-
ServerPlayer serverPlayer = server.getPlayerList().getPlayer(player);
46-
if (serverPlayer == null)
41+
if (context.player() instanceof ServerPlayer player) {
4742
return;
43+
}
4844

49-
for (ItemStack stack : serverPlayer.getAllSlots()) {
50-
if (stack.getItem() instanceof SmartGlassesItem) {
51-
SmartGlassesComputer computer = SmartGlassesItem.getServerComputer(server, stack);
52-
53-
if (computer != null) {
54-
OverlayModule module = computer.getModule(OverlayModule.class);
55-
56-
if (module != null)
57-
module.setScreenSizes(screenWidth, screenHeight, guiScale);
58-
}
59-
}
45+
ItemStack smartGlasses = SmartGlassesItem.getEquipped(player);
46+
if (smartGlasses.isEmpty()) {
47+
return;
48+
}
49+
SmartGlassesComputer computer = SmartGlassesItem.getServerComputer(player.server, stack);
50+
if (computer == null) {
51+
return;
52+
}
53+
OverlayModule module = computer.getModule(OverlayModule.class);
54+
if (module == null) {
55+
return;
6056
}
57+
module.setScreenSizes(screenWidth, screenHeight, guiScale);
6158
}
6259

6360
@Override

0 commit comments

Comments
 (0)