|
7 | 7 | import de.srendi.advancedperipherals.common.smartglasses.modules.overlay.OverlayModule; |
8 | 8 | import net.minecraft.network.RegistryFriendlyByteBuf; |
9 | 9 | import net.minecraft.network.protocol.common.custom.CustomPacketPayload; |
10 | | -import net.minecraft.server.MinecraftServer; |
11 | 10 | import net.minecraft.server.level.ServerPlayer; |
12 | 11 | import net.minecraft.world.item.ItemStack; |
13 | 12 | import net.neoforged.neoforge.network.handling.IPayloadContext; |
14 | | -import net.neoforged.neoforge.server.ServerLifecycleHooks; |
15 | 13 |
|
16 | 14 | import java.util.UUID; |
17 | 15 |
|
@@ -40,24 +38,23 @@ public OverlayModuleClientInfoPacket(RegistryFriendlyByteBuf buffer) { |
40 | 38 |
|
41 | 39 | @Override |
42 | 40 | 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) { |
47 | 42 | return; |
| 43 | + } |
48 | 44 |
|
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; |
60 | 56 | } |
| 57 | + module.setScreenSizes(screenWidth, screenHeight, guiScale); |
61 | 58 | } |
62 | 59 |
|
63 | 60 | @Override |
|
0 commit comments