Skip to content

Commit c6fe160

Browse files
authored
Fix Paper command executor on modern Paper versions (#4791)
1 parent 5c46bea commit c6fe160

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

providers/BaseProviders/src/main/java/net/ess3/provider/providers/BukkitSenderProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.UUID;
1313

1414
public class BukkitSenderProvider implements CommandSender {
15-
private final ConsoleCommandSender base;
15+
protected final ConsoleCommandSender base;
1616
private final MessageHook hook;
1717

1818
public BukkitSenderProvider(ConsoleCommandSender base, MessageHook hook) {

providers/PaperProvider/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ java {
77
}
88

99
dependencies {
10-
implementation project(':providers:BaseProviders')
10+
implementation(project(':providers:BaseProviders')) {
11+
exclude(module: 'spigot-api')
12+
}
1113
compileOnly 'io.papermc.paper:paper-api:1.18.1-R0.1-SNAPSHOT'
1214
compileOnly 'io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT'
1315
}

providers/PaperProvider/src/main/java/net/ess3/provider/providers/PaperCommandSender.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.kyori.adventure.text.ComponentLike;
88
import org.bukkit.Bukkit;
99
import org.bukkit.command.ConsoleCommandSender;
10+
import org.jetbrains.annotations.NotNull;
1011

1112
public class PaperCommandSender extends BukkitSenderProvider {
1213
public PaperCommandSender(ConsoleCommandSender base, MessageHook hook) {
@@ -76,4 +77,9 @@ public void sendMessage(Identified source, Component message, MessageType type)
7677
public void sendDumbComponent(Component message) {
7778
sendMessage(Bukkit.getUnsafe().legacyComponentSerializer().serialize(message));
7879
}
80+
81+
@Override
82+
public @NotNull Component name() {
83+
return base.name();
84+
}
7985
}

0 commit comments

Comments
 (0)