diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 11:33:03 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 11:33:03 +0000 |
commit | 86aa75c3b5b1f634e6876f2cdf75e11d9565a329 (patch) | |
tree | 71f3632f175af8c3d43e3f6423f3bd92dba67d3a /src/main | |
parent | 090e066c27ecff3eb65ca2ef0ab56ad91f9de12f (diff) | |
download | bukkit-86aa75c3b5b1f634e6876f2cdf75e11d9565a329.tar bukkit-86aa75c3b5b1f634e6876f2cdf75e11d9565a329.tar.gz bukkit-86aa75c3b5b1f634e6876f2cdf75e11d9565a329.tar.lz bukkit-86aa75c3b5b1f634e6876f2cdf75e11d9565a329.tar.xz bukkit-86aa75c3b5b1f634e6876f2cdf75e11d9565a329.zip |
ConsoleCommandSender no longer has a default constructor, use ConsoleCommandSender(server). Added entity.getServer
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/command/CommandSender.java | 9 | ||||
-rw-r--r-- | src/main/java/org/bukkit/command/ConsoleCommandSender.java | 12 | ||||
-rw-r--r-- | src/main/java/org/bukkit/entity/Entity.java | 8 |
3 files changed, 29 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java index 713e325f..0516abcd 100644 --- a/src/main/java/org/bukkit/command/CommandSender.java +++ b/src/main/java/org/bukkit/command/CommandSender.java @@ -1,5 +1,7 @@ package org.bukkit.command; +import org.bukkit.Server; + public interface CommandSender { /** @@ -24,4 +26,11 @@ public interface CommandSender { */ @Deprecated public boolean isPlayer(); + + /** + * Returns the server instance that this player is running through + * + * @return Server instance + */ + public Server getServer(); }
\ No newline at end of file diff --git a/src/main/java/org/bukkit/command/ConsoleCommandSender.java b/src/main/java/org/bukkit/command/ConsoleCommandSender.java index 896c2970..43feafe5 100644 --- a/src/main/java/org/bukkit/command/ConsoleCommandSender.java +++ b/src/main/java/org/bukkit/command/ConsoleCommandSender.java @@ -1,10 +1,18 @@ package org.bukkit.command; +import org.bukkit.Server; + /** * Represents CLI input from a console */ public class ConsoleCommandSender implements CommandSender { + private final Server server; + + public ConsoleCommandSender(Server server) { + this.server = server; + } + public void sendMessage(String message) { System.out.println(message.replaceAll("(?i)\u00A7[0-F]", "")); } @@ -16,4 +24,8 @@ public class ConsoleCommandSender implements CommandSender { public boolean isPlayer() { return false; } + + public Server getServer() { + return server; + } } diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java index c38cc8dd..426b35f7 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -2,6 +2,7 @@ package org.bukkit.entity; import org.bukkit.Location; +import org.bukkit.Server; import org.bukkit.World; /** @@ -68,4 +69,11 @@ public interface Entity { * Mark the entity's removal. */ public void remove(); + + /** + * Gets the {@link Server} that contains this Entity + * + * @return Server instance running this Entity + */ + public Server getServer(); } |