Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-24 20:42:39 +02:00
Code Issues Projects Releases Wiki Activity

Put equality check in the final method

Browse Source 
Signed-off-by: TheMode <themode@outlook.fr>
This commit is contained in:
TheMode 2021-09-20 22:32:16 +02:00
parent 3ea414fe85
commit 2e017c3f0e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -305,11 +305,12 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
@Override @Override
public final boolean addViewer(@NotNull Player player) { public final boolean addViewer(@NotNull Player player) {
if (player == this) return false;
return addViewer0(player); return addViewer0(player);
} }
protected boolean addViewer0(@NotNull Player player) { protected boolean addViewer0(@NotNull Player player) {
if (player == this || !this.viewers.add(player)) { if (!this.viewers.add(player)) {
return false; return false;
} }
player.viewableEntities.add(this); player.viewableEntities.add(this);
@ -335,11 +336,12 @@ public class Entity implements Viewable, Tickable, TagHandler, PermissionHandler
@Override @Override
public final boolean removeViewer(@NotNull Player player) { public final boolean removeViewer(@NotNull Player player) {
if (player == this) return false;
return removeViewer0(player); return removeViewer0(player);
} }
protected boolean removeViewer0(@NotNull Player player) { protected boolean removeViewer0(@NotNull Player player) {
if (player == this || !viewers.remove(player)) { if (!viewers.remove(player)) {
return false; return false;
} }
player.getPlayerConnection().sendPacket(new DestroyEntitiesPacket(getEntityId())); player.getPlayerConnection().sendPacket(new DestroyEntitiesPacket(getEntityId()));