Skip to content

Commit 1464ef2

Browse files
committed
Add command invoker for change command events
Related #1285
1 parent 46239c9 commit 1464ef2

File tree

3 files changed

+17
-5
lines changed

3 files changed

+17
-5
lines changed

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/CrackedCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void onCrackedSelf(CommandSender sender) {
7171
plugin.getScheduler().runAsync(() -> {
7272
plugin.getCore().getStorage().save(profile);
7373
plugin.getServer().getPluginManager().callEvent(
74-
new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
74+
new BukkitFastLoginPremiumToggleEvent(sender, profile, PremiumToggleReason.COMMAND_OTHER));
7575
});
7676
} else {
7777
plugin.getCore().sendLocaleMessage("not-premium", sender);
@@ -104,7 +104,7 @@ private void onCrackedOther(CommandSender sender, Command command, String[] args
104104
plugin.getScheduler().runAsync(() -> {
105105
plugin.getCore().getStorage().save(profile);
106106
plugin.getServer().getPluginManager().callEvent(
107-
new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
107+
new BukkitFastLoginPremiumToggleEvent(sender, profile, PremiumToggleReason.COMMAND_OTHER));
108108
});
109109
}
110110
}

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/command/PremiumCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ private void onPremiumSelf(CommandSender sender) {
8686
plugin.getScheduler().runAsync(() -> {
8787
plugin.getCore().getStorage().save(profile);
8888
plugin.getServer().getPluginManager().callEvent(
89-
new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_SELF));
89+
new BukkitFastLoginPremiumToggleEvent(sender, profile, PremiumToggleReason.COMMAND_SELF));
9090
});
9191

9292
plugin.getCore().sendLocaleMessage("add-premium", sender);
@@ -117,7 +117,7 @@ private void onPremiumOther(CommandSender sender, Command command, String[] args
117117
plugin.getScheduler().runAsync(() -> {
118118
plugin.getCore().getStorage().save(profile);
119119
plugin.getServer().getPluginManager().callEvent(
120-
new BukkitFastLoginPremiumToggleEvent(profile, PremiumToggleReason.COMMAND_OTHER));
120+
new BukkitFastLoginPremiumToggleEvent(sender, profile, PremiumToggleReason.COMMAND_OTHER));
121121
});
122122

123123
plugin.getCore().sendLocaleMessage("add-premium-other", sender);

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/event/BukkitFastLoginPremiumToggleEvent.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,23 @@
2727

2828
import com.github.games647.fastlogin.core.shared.event.FastLoginPremiumToggleEvent;
2929
import com.github.games647.fastlogin.core.storage.StoredProfile;
30+
import org.bukkit.command.CommandSender;
3031
import org.bukkit.event.Event;
3132
import org.bukkit.event.HandlerList;
3233
import org.jetbrains.annotations.NotNull;
3334

3435
public class BukkitFastLoginPremiumToggleEvent extends Event implements FastLoginPremiumToggleEvent {
3536

3637
private static final HandlerList HANDLERS = new HandlerList();
38+
39+
private final CommandSender invoker;
3740
private final StoredProfile profile;
3841
private final PremiumToggleReason reason;
3942

40-
public BukkitFastLoginPremiumToggleEvent(StoredProfile profile, PremiumToggleReason reason) {
43+
public BukkitFastLoginPremiumToggleEvent(CommandSender invoker, StoredProfile profile, PremiumToggleReason reason) {
4144
super(true);
45+
46+
this.invoker = invoker;
4247
this.profile = profile;
4348
this.reason = reason;
4449
}
@@ -48,6 +53,13 @@ public StoredProfile getProfile() {
4853
return profile;
4954
}
5055

56+
/**
57+
* @return who triggered this change. This could be a Player for itself or others (Admin) or the console.
58+
*/
59+
public CommandSender getInvoker() {
60+
return invoker;
61+
}
62+
5163
@Override
5264
public PremiumToggleReason getReason() {
5365
return reason;

0 commit comments

Comments
 (0)