Finalising merge with head

3 files changed, 44 insertions, 0 deletions

diff --git a/src/main/java/org/bukkit/command/CommandSender.java b/src/main/java/org/bukkit/command/CommandSender.java
new file mode 100644
index 00000000..13ed3548
--- /dev/null
+++ b/src/main/java/org/bukkit/command/CommandSender.java
@@ -0,0 +1,19 @@
+package org.bukkit.command;
+
+
+public interface CommandSender {
+    /**
+     * Sends this sender a message
+     *
+     * @param message Message to be displayed
+     */
+    public void sendMessage(String message);
+
+    /**
+     * Checks if this player is currently op
+     *
+     * @return true if they are
+     */
+    public boolean isOp();
+
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/event/server/ServerCommandEvent.java b/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
new file mode 100644
index 00000000..5c1020fe
--- /dev/null
+++ b/src/main/java/org/bukkit/event/server/ServerCommandEvent.java
@@ -0,0 +1,13 @@
+
+package org.bukkit.event.server;
+
+import org.bukkit.event.Event;
+
+/**
+ * Server Command events
+ */
+public class ServerCommandEvent extends Event {
+    public ServerCommandEvent(final Type type) {
+        super(type);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/org/bukkit/plugin/IExecutor.java b/src/main/java/org/bukkit/plugin/IExecutor.java
new file mode 100644
index 00000000..e16c3fa7
--- /dev/null
+++ b/src/main/java/org/bukkit/plugin/IExecutor.java
@@ -0,0 +1,12 @@
+
+package org.bukkit.plugin;
+
+import org.bukkit.event.Event;
+import org.bukkit.event.Listener;
+
+/**
+ * Interface which defines the class for event call backs to plugins
+ */
+public interface IExecutor {
+    public void execute( Listener listener, Event event );
+}
\ No newline at end of file