From 1c19703f447908b902e7e5db09d953de663aebd1 Mon Sep 17 00:00:00 2001 From: tastybento Date: Thu, 4 Apr 2024 09:11:49 -0700 Subject: [PATCH] Merge if statement --- .../island/team/IslandTeamInviteAcceptCommand.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java index 4f4d47cd2..88c91c162 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java @@ -185,11 +185,10 @@ public class IslandTeamInviteAcceptCommand extends ConfirmableCommand { Util.runCommands(user, ownerName, getIWM().getOnJoinCommands(getWorld()), "join"); }); - if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands()) { + if (getIWM().getWorldSettings(getWorld()).isDisallowTeamMemberIslands() + && getIWM().isTeamJoinDeathReset(getWorld())) { // Reset deaths - if (getIWM().isTeamJoinDeathReset(getWorld())) { - getPlayers().setDeaths(getWorld(), user.getUniqueId(), 0); - } + getPlayers().setDeaths(getWorld(), user.getUniqueId(), 0); } user.sendMessage("commands.island.team.invite.accept.you-joined-island", TextVariables.LABEL, getTopLabel()); User inviter = User.getInstance(invite.getInviter());