Skip to content

Commit b4cc8ed

Browse files
author
bridge
committed
fix: potential canSee NPE
1 parent c16e9d6 commit b4cc8ed

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

plugin/src/main/java/at/helpch/chatchat/hooks/vanish/EssentialsVanishHook.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ public void enable() {
4545

4646
@Override
4747
public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
48-
return user.playerNotNull().canSee(target.playerNotNull());
48+
return user.player()
49+
.map(player -> target.player().map(player::canSee).orElse(true))
50+
.orElse(true);
4951
}
5052
}

plugin/src/main/java/at/helpch/chatchat/hooks/vanish/SuperVanishHook.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public void enable() {
4848

4949
@Override
5050
public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
51-
return VanishAPI.canSee(user.playerNotNull(), target.playerNotNull());
51+
return user.player()
52+
.map(player -> target.player().map(targetPlayer -> VanishAPI.canSee(player, targetPlayer))
53+
.orElse(true))
54+
.orElse(true);
5255
}
5356
}

plugin/src/main/java/at/helpch/chatchat/hooks/vanish/VanillaVanishHook.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ public void enable() {
4444

4545
@Override
4646
public boolean canSee(@NotNull final ChatUser user, @NotNull final ChatUser target) {
47-
return user.playerNotNull().canSee(target.playerNotNull());
47+
return user.player()
48+
.map(player -> target.player().map(player::canSee).orElse(true))
49+
.orElse(true);
4850
}
4951
}

0 commit comments

Comments
 (0)