summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/bukkit
diff options
context:
space:
mode:
authorDinnerbone <dinnerbone@dinnerbone.com>2011-02-23 11:32:19 +0000
committerDinnerbone <dinnerbone@dinnerbone.com>2011-02-23 11:33:41 +0000
commitbfca34cad47a4c7dcc31f67afe53bf4db85be15d (patch)
treee90af469d29a3c5e5665901c49c5725be3f7fda8 /src/main/java/org/bukkit
parent6655b8903773bf52cbb95f2871b69d052c55be10 (diff)
downloadcraftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar
craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.gz
craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.lz
craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.tar.xz
craftbukkit-bfca34cad47a4c7dcc31f67afe53bf4db85be15d.zip
ConsoleCommandSender no longer has a default constructor, use ConsoleCommandSender(server). Added entity.getServer and updated the version number of mc
Diffstat (limited to 'src/main/java/org/bukkit')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftServer.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 1d9ee884..9547ae01 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -30,7 +30,7 @@ import org.bukkit.event.world.WorldEvent;
public final class CraftServer implements Server {
private final String serverName = "Craftbukkit";
private final String serverVersion;
- private final String protocolVersion = "1.2_01";
+ private final String protocolVersion = "1.3";
private final PluginManager pluginManager = new SimplePluginManager(this);
private final BukkitScheduler scheduler = new CraftScheduler(this);
private final CommandMap commandMap = new SimpleCommandMap(this);
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9a876741..63ffbb5c 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -173,4 +173,8 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
public String toString() {
return "CraftEntity{" + "id=" + getEntityId() + '}';
}
+
+ public CraftServer getServer() {
+ return server;
+ }
}