From 8e8bc4589b0d39909c9f5ac21489e75f57dd6cf4 Mon Sep 17 00:00:00 2001 From: CreepyCre Date: Wed, 17 Feb 2021 18:44:03 +0100 Subject: [PATCH] ServerPlayerEntity in ServerPacketHandler now implied by network handler --- .../dimdev/dimdoors/network/ServerPacketHandler.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/dimdev/dimdoors/network/ServerPacketHandler.java b/src/main/java/org/dimdev/dimdoors/network/ServerPacketHandler.java index 67968850..5af5d9af 100644 --- a/src/main/java/org/dimdev/dimdoors/network/ServerPacketHandler.java +++ b/src/main/java/org/dimdev/dimdoors/network/ServerPacketHandler.java @@ -27,8 +27,6 @@ public class ServerPacketHandler { private final ServerPlayNetworkHandler networkHandler; private final MinecraftServer server; - private final ServerPlayerEntity player; - private final Set registeredChannels = new HashSet<>(); private void registerModReceivers() { @@ -39,7 +37,6 @@ public class ServerPacketHandler { public ServerPacketHandler(ServerPlayNetworkHandler networkHandler, MinecraftServer server) { this.networkHandler = networkHandler; this.server = server; - this.player = networkHandler.player; registerModReceivers(); } @@ -64,11 +61,15 @@ public class ServerPacketHandler { new HashSet<>(registeredChannels).forEach(this::unregisterReceiver); } + public ServerPlayerEntity getPlayer() { + return networkHandler.player; + } + public void onAttackBlock(Hand hand, BlockPos pos, Direction direction) { server.execute(() -> { - Item item = player.getStackInHand(hand).getItem(); + Item item = getPlayer().getStackInHand(hand).getItem(); if (item instanceof ModItem) { - ((ModItem) item).onAttackBlock(player.world, player, hand, pos, direction); + ((ModItem) item).onAttackBlock(getPlayer().world, getPlayer(), hand, pos, direction); } }); }