Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove redundant fromInstance calls #3122

Merged
merged 1 commit into from
Aug 22, 2020
Merged

Remove redundant fromInstance calls #3122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/main/java/org/spongepowered/common/relocate/co/aikar/timings/SpongeTimingsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,8 @@ private static String timeSummary(int seconds) {
return time;
}

private static PluginContainer checkPlugin(Object plugin) {
Optional<PluginContainer> optPlugin = SpongeCommon.getGame().getPluginManager().fromInstance(plugin);
checkArgument(optPlugin.isPresent(), "Provided object is not a plugin instance");
return optPlugin.get();
}

@Override
public Timing of(PluginContainer pluginObj, String name, @Nullable Timing groupHandler) {
PluginContainer plugin = checkPlugin(pluginObj);
public Timing of(PluginContainer plugin, String name, @Nullable Timing groupHandler) {
return TimingsManager.getHandler(plugin.getMetadata().getId(), name, groupHandler, true);
}

Expand Down
10 changes: 2 additions & 8 deletions src/main/java/org/spongepowered/common/service/permission/SpongePermissionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,14 +181,8 @@ public void registerContextCalculator(final ContextCalculator<Subject> calculato
}

@Override
public Builder newDescriptionBuilder(final PluginContainer instance) {
final Optional<PluginContainer> container = this.game.getPluginManager().fromInstance(checkNotNull(instance, "instance"));
if (!container.isPresent()) {
throw new IllegalArgumentException("The provided plugin object does not have an associated plugin container "
+ "(in other words, is 'plugin' actually your plugin object?)");
}

return new SpongePermissionDescription.Builder(this, container.get());
public Builder newDescriptionBuilder(final PluginContainer container) {
return new SpongePermissionDescription.Builder(this, container);
}

public void addDescription(final PermissionDescription permissionDescription) {
Expand Down