Skip to content

Commit 223b432

Browse files
committed
fix: getProvidingClass usages in more places
1 parent 4946485 commit 223b432

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

paper/src/main/java/org/incendo/interfaces/paper/PaperInterfaceListeners.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.google.common.cache.CacheBuilder;
66

77
import java.lang.reflect.Method;
8+
import java.util.Objects;
89
import java.util.UUID;
910

1011
import java.util.concurrent.ConcurrentHashMap;
@@ -260,8 +261,13 @@ public void onInventoryClose(final @NonNull InventoryCloseEvent event) {
260261
}
261262
}
262263
if (playerInventoryView != null && VALID_REASON.contains(reason)) {
264+
Plugin plugin = Objects.requireNonNullElseGet(
265+
PaperInterfaceListeners.plugin(),
266+
() -> JavaPlugin.getProvidingPlugin(this.getClass())
267+
);
268+
263269
Bukkit.getScheduler().runTaskAsynchronously(
264-
JavaPlugin.getProvidingPlugin(this.getClass()),
270+
plugin,
265271
playerInventoryView::open
266272
);
267273
}

paper/src/main/java/org/incendo/interfaces/paper/PlayerViewerImpl.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import org.bukkit.Bukkit;
44
import org.bukkit.entity.Player;
5+
import org.bukkit.plugin.Plugin;
56
import org.bukkit.plugin.java.JavaPlugin;
67
import org.checkerframework.checker.nullness.qual.NonNull;
78
import org.incendo.interfaces.core.view.InterfaceView;
@@ -11,6 +12,8 @@
1112
import org.incendo.interfaces.paper.view.CombinedView;
1213
import org.incendo.interfaces.paper.view.PlayerInventoryView;
1314

15+
import java.util.Objects;
16+
1417
final class PlayerViewerImpl implements PlayerViewer {
1518

1619
private final @NonNull Player player;
@@ -64,7 +67,12 @@ public void open(final @NonNull InterfaceView<?, ?> view) {
6467
runnable.run();
6568
} else {
6669
try {
67-
Bukkit.getScheduler().callSyncMethod(JavaPlugin.getProvidingPlugin(this.getClass()), () -> {
70+
Plugin plugin = Objects.requireNonNullElseGet(
71+
PaperInterfaceListeners.plugin(),
72+
() -> JavaPlugin.getProvidingPlugin(this.getClass())
73+
);
74+
75+
Bukkit.getScheduler().callSyncMethod(plugin, () -> {
6876
runnable.run();
6977

7078
return null;

0 commit comments

Comments
 (0)