From 5d15e76323d028e9018702392c256c93671c2e82 Mon Sep 17 00:00:00 2001 From: TheMode Date: Fri, 17 Dec 2021 20:53:00 +0100 Subject: [PATCH] Style Signed-off-by: TheMode --- .../java/net/minestom/server/entity/Player.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/minestom/server/entity/Player.java b/src/main/java/net/minestom/server/entity/Player.java index e194c0c5f..1056bff36 100644 --- a/src/main/java/net/minestom/server/entity/Player.java +++ b/src/main/java/net/minestom/server/entity/Player.java @@ -649,13 +649,11 @@ public class Player extends LivingEntity implements CommandSender, Localizable, @Override public void playSound(@NotNull Sound sound, Sound.@NotNull Emitter emitter) { final ServerPacket packet; - if (emitter == Sound.Emitter.self()) { packet = AdventurePacketConvertor.createSoundPacket(sound, this); } else { packet = AdventurePacketConvertor.createSoundPacket(sound, emitter); } - playerConnection.sendPacket(packet); } @@ -936,11 +934,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, */ @Override public @NotNull Component getName() { - if (this.displayName != null) { - return this.displayName; - } else { - return this.usernameComponent; - } + return Objects.requireNonNullElse(displayName, usernameComponent); } /** @@ -972,10 +966,7 @@ public class Player extends LivingEntity implements CommandSender, Localizable, * @return true if player can drop the item (event not cancelled), false otherwise */ public boolean dropItem(@NotNull ItemStack item) { - if (item.isAir()) { - return false; - } - + if (item.isAir()) return false; ItemDropEvent itemDropEvent = new ItemDropEvent(this, item); EventDispatcher.call(itemDropEvent); return !itemDropEvent.isCancelled();