funkemunky/commands
1
0
Fork 0
mirror of https://github.com/aikar/commands.git synced 2026-05-31 06:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #421 from Intybyte/update/sponge-8-fix

Browse Source 
Update/sponge 8 fix
This commit is contained in:
chickeneer
2025-04-12 10:14:05 -05:00
committed by GitHub
parent ddb827e5b2 056d595ddf
commit 51ec341fb9
4 changed files with 32 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sponge10/src/main/java/co/aikar/commands/ACFSpongeUtil.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class ACFSpongeUtil {
while (iter.hasNext()) {
Player player = iter.next();
if (requester instanceof Player && !((Player) requester).canSee(player)) {
if (requester.hasPermission("acf.seevanish")) {
if (requester.commandCause().hasPermission("acf.seevanish")) {
if (!search.endsWith(":confirm")) {
confirmList.add(player);
iter.remove();
sponge10/src/main/java/co/aikar/commands/SpongeCommandContexts.java
+1 -1
View File
@@ -132,7 +132,7 @@ public class SpongeCommandContexts extends CommandContexts<SpongeCommandExecutio
return decoration;
});
registerIssuerAwareContext(CommandCause.class, SpongeCommandExecutionContext::getSource);
registerIssuerAwareContext(CommandCause.class, (context) -> context.getSource().commandCause());
registerIssuerAwareContext(SpongeCommandSource.class, SpongeCommandExecutionContext::getSource);
registerIssuerAwareContext(ServerPlayer.class, (c) -> {
ServerPlayer serverPlayer = c.getIssuer().getServerPlayer();
sponge10/src/main/java/co/aikar/commands/SpongeCommandIssuer.java
+3 -3
View File
@@ -64,7 +64,7 @@ public class SpongeCommandIssuer implements CommandIssuer {
}
//generate a unique id based of the name (like for the console command sender)
return UUID.nameUUIDFromBytes(source.identifier().getBytes(StandardCharsets.UTF_8));
return UUID.nameUUIDFromBytes(source.commandCause().identifier().getBytes(StandardCharsets.UTF_8));
}
public Player getPlayer() {
@@ -83,13 +83,13 @@ public class SpongeCommandIssuer implements CommandIssuer {
@Override
public void sendMessageInternal(String message) {
try {
source.audience().sendMessage(LegacyComponentSerializer.legacyAmpersand().deserialize(message));
source.commandCause().audience().sendMessage(LegacyComponentSerializer.legacyAmpersand().deserialize(message));
} catch (Exception ignored) {}
}
@Override
public boolean hasPermission(final String permission) {
return this.source.hasPermission(permission);
return this.source.commandCause().hasPermission(permission);
}
@Override
sponge10/src/main/java/co/aikar/commands/SpongeCommandSource.java
+27 -69
View File
@@ -1,96 +1,54 @@
package co.aikar.commands;
import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.identity.Identified;
import net.kyori.adventure.identity.Identity;
import net.kyori.adventure.text.Component;
import org.spongepowered.api.block.BlockSnapshot;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.api.command.CommandCause;
import org.spongepowered.api.command.parameter.CommandContext;
import org.spongepowered.api.event.Cause;
import org.spongepowered.api.service.permission.Subject;
import org.spongepowered.api.util.locale.LocaleSource;
import org.spongepowered.api.util.locale.Locales;
import org.spongepowered.api.world.server.ServerLocation;
import org.spongepowered.math.vector.Vector3d;
import java.util.Locale;
import java.util.Optional;
public class SpongeCommandSource implements LocaleSource, CommandCause {
private CommandCause commandCause;
private LocaleSource localeSource;
public class SpongeCommandSource {
private final @NotNull CommandCause commandCause;
private final @NotNull Locale locale;
public SpongeCommandSource(CommandContext commandContext) {
commandCause = commandContext.cause();
Subject subject = commandContext.subject();
if (subject instanceof LocaleSource) {
localeSource = (LocaleSource) subject;
public SpongeCommandSource(@NotNull CommandCause cause) {
this.commandCause = cause;
if (cause instanceof LocaleSource) {
locale = ((LocaleSource) cause).locale();
} else if (cause.subject() instanceof LocaleSource) {
locale = ((LocaleSource) cause.subject()).locale();
} else {
localeSource = null;
locale = Locales.DEFAULT;
}
}
@Deprecated
public SpongeCommandSource(CommandContext commandContext) {
this(commandContext.cause());
}
@Deprecated
public <T> SpongeCommandSource(T obj) {
if (obj instanceof CommandCause) {
commandCause = (CommandCause) obj;
} else {
//having it set to null will lead to unexpected behaviour/NPEs
throw new IllegalArgumentException("When creating SpongeCommandSource the object must extend CommandCause");
}
if (obj instanceof LocaleSource) {
localeSource = (LocaleSource) obj;
locale = ((LocaleSource) obj).locale();
} else {
locale = Locales.DEFAULT;
}
}
@Override
public Locale locale() {
if (localeSource == null) {
return Locales.DEFAULT;
}
return localeSource.locale();
public @NotNull Locale locale() {
return locale;
}
@Override
public Cause cause() {
return commandCause.cause();
}
@Override
public Subject subject() {
return commandCause.subject();
}
@Override
public Audience audience() {
return commandCause.audience();
}
@Override
public Optional<ServerLocation> location() {
return commandCause.location();
}
@Override
public Optional<Vector3d> rotation() {
return commandCause.rotation();
}
@Override
public Optional<BlockSnapshot> targetBlock() {
return commandCause.targetBlock();
}
@Override
public void sendMessage(Component message) {
commandCause.sendMessage(message);
}
@Override
public void sendMessage(Identified source, Component message) {
commandCause.sendMessage(source, message);
}
@Override
public void sendMessage(Identity source, Component message) {
commandCause.sendMessage(source, message);
public @NotNull CommandCause commandCause() {
return commandCause;
}
}