Skip to content

Commit 1bdd200

Browse files
committed
Try to fix a weird null case
1 parent 679035c commit 1bdd200

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

modules/API/src/main/java/com/comphenix/protocol/utility/MinecraftFields.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public static Object getNetworkManager(Player player) {
4747
* @return The player connection.
4848
*/
4949
public static Object getPlayerConnection(Player player) {
50+
Preconditions.checkNotNull(player, "player cannot be null!");
5051
return getPlayerConnection(BukkitUnwrapper.getInstance().unwrapItem(player));
5152
}
5253

modules/ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ private void invokeSendPacket(Object packet) {
671671
MinecraftMethods.getSendPacketMethod().invoke(getPlayerConnection(), packet);
672672
}
673673
} catch (Throwable ex) {
674-
ProtocolLibrary.getErrorReporter().reportWarning(factory.getPlugin(),
674+
ProtocolLibrary.getErrorReporter().reportWarning(this,
675675
Report.newBuilder(REPORT_CANNOT_SEND_PACKET).messageParam(packet, playerName).error(ex).build());
676676
}
677677
}
@@ -716,7 +716,7 @@ public Protocol getCurrentProtocol() {
716716
*/
717717
private Object getPlayerConnection() {
718718
if (playerConnection == null) {
719-
playerConnection = MinecraftFields.getPlayerConnection(player);
719+
playerConnection = MinecraftFields.getPlayerConnection(getPlayer());
720720
}
721721
return playerConnection;
722722
}

0 commit comments

Comments
 (0)