Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid static initialization

This commit is contained in:
themode 2022-01-12 09:50:09 +01:00
parent 0ccaa6a888
commit 2dacaa8020
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minestom/server/entity/Player.java
View File

@ -46,7 +46,6 @@ import net.minestom.server.inventory.PlayerInventory;
import net.minestom.server.item.ItemStack;
import net.minestom.server.item.Material;
import net.minestom.server.item.metadata.WrittenBookMeta;
import net.minestom.server.listener.manager.PacketListenerManager;
import net.minestom.server.message.ChatMessageType;
import net.minestom.server.message.ChatPosition;
import net.minestom.server.message.Messenger;
@ -104,7 +103,6 @@ import java.util.function.UnaryOperator;
public class Player extends LivingEntity implements CommandSender, Localizable, HoverEventSource<ShowEntity>, Identified, NamedAndIdentified {
private static final Component REMOVE_MESSAGE = Component.text("You have been removed from the server without reason.", NamedTextColor.RED);
private static final PacketListenerManager PACKET_LISTENER_MANAGER = MinecraftServer.getPacketListenerManager();
private long lastKeepAlive;
private boolean answerKeepAlive;
@ -306,7 +304,8 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
* Used to initialize the player connection
*/
protected void playerConnectionInit() {
this.playerConnection.setPlayer(this);
PlayerConnection connection = playerConnection;
if (connection != null) connection.setPlayer(this);
}
@Override
@ -315,7 +314,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable,
this.playerConnection.update();
// Process received packets
this.packets.drain(packet -> PACKET_LISTENER_MANAGER.processClientPacket(packet, this));
this.packets.drain(packet -> MinecraftServer.getPacketListenerManager().processClientPacket(packet, this));
super.update(time); // Super update (item pickup/fire management)