diff --git a/src/main/java/net/dv8tion/jda/api/entities/templates/Template.java b/src/main/java/net/dv8tion/jda/api/entities/templates/Template.java index fc64250dcd..5e8d74759e 100644 --- a/src/main/java/net/dv8tion/jda/api/entities/templates/Template.java +++ b/src/main/java/net/dv8tion/jda/api/entities/templates/Template.java @@ -55,8 +55,6 @@ public class Template private final TemplateGuild guild; private final boolean synced; - protected TemplateManager manager; - public Template(final JDAImpl api, final String code, final String name, final String description, final int uses, final User creator, final OffsetDateTime createdAt, final OffsetDateTime updatedAt, final TemplateGuild guild, final boolean synced) @@ -277,9 +275,7 @@ public boolean isSynced() public TemplateManager getManager() { checkInteraction(); - if (manager == null) - return manager = new TemplateManagerImpl(this); - return manager; + return new TemplateManagerImpl(this); } private void checkInteraction() diff --git a/src/main/java/net/dv8tion/jda/internal/entities/EmoteImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/EmoteImpl.java index 0c471bd091..4d6c010bd5 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/EmoteImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/EmoteImpl.java @@ -46,8 +46,6 @@ public class EmoteImpl implements ListedEmote private final JDAImpl api; private final Set roles; - private EmoteManager manager; - private GuildImpl guild; private boolean managed = false; private boolean available = true; @@ -148,9 +146,7 @@ public boolean hasUser() @Override public EmoteManager getManager() { - if (manager == null) - return manager = new EmoteManagerImpl(this); - return manager; + return new EmoteManagerImpl(this); } @Override diff --git a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java index 5c3f166b7a..2fae3ff70d 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/GuildImpl.java @@ -92,7 +92,6 @@ public class GuildImpl implements Guild private final MemberCacheViewImpl memberCache = new MemberCacheViewImpl(); private final CacheView.SimpleCacheView memberPresences; - private GuildManager manager; private CompletableFuture pendingRequestToSpeak; private Member owner; @@ -882,9 +881,7 @@ public BaseGuildMessageChannel getDefaultChannel() @Override public GuildManager getManager() { - if (manager == null) - return manager = new GuildManagerImpl(this); - return manager; + return new GuildManagerImpl(this); } @Override diff --git a/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java index 67ddb155ea..d7b32b23f8 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/PermissionOverrideImpl.java @@ -39,8 +39,6 @@ public class PermissionOverrideImpl implements PermissionOverride private final JDAImpl api; private IPermissionContainer channel; - protected PermissionOverrideAction manager; - private long allow; private long deny; @@ -150,10 +148,7 @@ public boolean isRoleOverride() public PermissionOverrideAction getManager() { checkPermissions(); - - if (manager == null) - return manager = new PermissionOverrideActionImpl(this).setOverride(false); - return manager; + return new PermissionOverrideActionImpl(this).setOverride(false); } @Nonnull diff --git a/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java index 550d838a87..36da6f79a0 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/RoleImpl.java @@ -50,8 +50,6 @@ public class RoleImpl implements Role private final JDAImpl api; private Guild guild; - private RoleManager manager; - private RoleTagsImpl tags; private String name; private boolean managed; @@ -299,9 +297,7 @@ public RoleAction createCopy(@Nonnull Guild guild) @Override public RoleManager getManager() { - if (manager == null) - return manager = new RoleManagerImpl(this); - return manager; + return new RoleManagerImpl(this); } @Nonnull diff --git a/src/main/java/net/dv8tion/jda/internal/entities/SelfUserImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/SelfUserImpl.java index f0363e372b..587334bd73 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/SelfUserImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/SelfUserImpl.java @@ -27,8 +27,6 @@ public class SelfUserImpl extends UserImpl implements SelfUser { - protected AccountManager manager; - private boolean verified; private boolean mfaEnabled; private long applicationId; @@ -95,9 +93,7 @@ public long getAllowedFileSize() @Override public AccountManager getManager() { - if (manager == null) - return manager = new AccountManagerImpl(this); - return manager; + return new AccountManagerImpl(this); } public SelfUserImpl setVerified(boolean verified) diff --git a/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java index 59a3fb88b7..9e27a69cba 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/StageInstanceImpl.java @@ -34,7 +34,6 @@ public class StageInstanceImpl implements StageInstance { private final long id; private StageChannel channel; - private StageInstanceManager manager; private String topic; private PrivacyLevel privacyLevel; @@ -96,9 +95,7 @@ public RestAction delete() public StageInstanceManager getManager() { checkPermissions(); - if (manager == null) - manager = new StageInstanceManagerImpl(this); - return manager; + return new StageInstanceManagerImpl(this); } public StageInstanceImpl setTopic(String topic) diff --git a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java index 0382c4d4aa..46625adeb6 100644 --- a/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java +++ b/src/main/java/net/dv8tion/jda/internal/entities/WebhookImpl.java @@ -42,7 +42,6 @@ public class WebhookImpl extends AbstractWebhookClient implements Webhook { private final BaseGuildMessageChannel channel; private final WebhookType type; - private WebhookManager manager; private Member owner; private User user, ownerUser; @@ -179,9 +178,7 @@ public AuditableRestAction delete(@Nonnull String token) @Override public WebhookManager getManager() { - if (manager == null) - return manager = new WebhookManagerImpl(this); - return manager; + return new WebhookManagerImpl(this); } @Override