From 2e017c3f0ebb77d9ff6265fbcfad00e854dbb1be Mon Sep 17 00:00:00 2001 From: TheMode Date: Mon, 20 Sep 2021 22:32:16 +0200 Subject: [PATCH] Put equality check in the final method Signed-off-by: TheMode --- src/main/java/net/minestom/server/entity/Entity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/Entity.java b/src/main/java/net/minestom/server/entity/Entity.java index 6d47e7f03..3c42d9c71 100644 --- a/src/main/java/net/minestom/server/entity/Entity.java +++ b/src/main/java/net/minestom/server/entity/Entity.java @@ -305,11 +305,12 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler @Override public final boolean addViewer(@NotNull Player player) { + if (player == this) return false; return addViewer0(player); } protected boolean addViewer0(@NotNull Player player) { - if (player == this || !this.viewers.add(player)) { + if (!this.viewers.add(player)) { return false; } player.viewableEntities.add(this); @@ -335,11 +336,12 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler @Override public final boolean removeViewer(@NotNull Player player) { + if (player == this) return false; return removeViewer0(player); } protected boolean removeViewer0(@NotNull Player player) { - if (player == this || !viewers.remove(player)) { + if (!viewers.remove(player)) { return false; } player.getPlayerConnection().sendPacket(new DestroyEntitiesPacket(getEntityId()));