spigot-mirror/bukkit
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/bukkit.git synced 2025-08-05 16:49:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#556: Allow sending messages from specific UUIDs

Browse source
This commit is contained in:
Mariell Hoversholm 2020-10-17 17:42:40 +11:00 • committed by md_5
parent 92b99cde85
commit 746f5324a3
No known key found for this signature in database
GPG key ID: E8E901AC7C617C11
3 changed files with 36 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/org/bukkit/command/CommandSender.java
View file

@ -1,8 +1,10 @@
package org.bukkit.command; package org.bukkit.command;
import java.util.UUID;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.permissions.Permissible; import org.bukkit.permissions.Permissible;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
public interface CommandSender extends Permissible { public interface CommandSender extends Permissible {
@ -20,6 +22,22 @@ public interface CommandSender extends Permissible {
*/ */
public void sendMessage(@NotNull String[] messages); public void sendMessage(@NotNull String[] messages);
/**
* Sends this sender a message
*
* @param message Message to be displayed
* @param sender The sender of this message
*/
public void sendMessage(@Nullable UUID sender, @NotNull String message);
/**
* Sends this sender multiple messages
*
* @param messages An array of messages to be displayed
* @param sender The sender of this message
*/
public void sendMessage(@Nullable UUID sender, @NotNull String[] messages);
/** /**
* Returns the server instance that this command is running on * Returns the server instance that this command is running on
* *

10
src/main/java/org/bukkit/conversations/Conversable.java
View file

@ -1,6 +1,8 @@
package org.bukkit.conversations; package org.bukkit.conversations;
import java.util.UUID;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** /**
* The Conversable interface is used to indicate objects that can have * The Conversable interface is used to indicate objects that can have
@ -54,4 +56,12 @@ public interface Conversable {
* @param message Message to be displayed * @param message Message to be displayed
*/ */
public void sendRawMessage(@NotNull String message); public void sendRawMessage(@NotNull String message);
/**
* Sends this sender a message raw
*
* @param message Message to be displayed
* @param sender The sender of this message
*/
public void sendRawMessage(@Nullable UUID sender, @NotNull String message);
} }

8
src/test/java/org/bukkit/conversations/FakeConversable.java
View file

@ -1,11 +1,14 @@
package org.bukkit.conversations; package org.bukkit.conversations;
import java.util.Set; import java.util.Set;
import java.util.UUID;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.permissions.Permission; import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment; import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo; import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** /**
*/ */
@ -48,6 +51,11 @@ public class FakeConversable implements Conversable {
lastSentMessage = message; lastSentMessage = message;
} }
@Override
public void sendRawMessage(@Nullable UUID sender, @NotNull String message) {
this.sendRawMessage(message);
}
public Server getServer() { public Server getServer() {
return null; return null;
} }