summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-06-26 18:07:11 +1000
committermd_5 <md_5@bigpond.com>2012-06-26 18:07:11 +1000
commit459f1b70cb255a9e6f528025018f890448caa1e9 (patch)
treeedc08682eb8d452e8c38de10b9f5a9aa63e2eeeb
parentba82ff0f4ef24b8d1cb50f0aec4546fef507ae74 (diff)
downloadEssentials-459f1b70cb255a9e6f528025018f890448caa1e9.tar
Essentials-459f1b70cb255a9e6f528025018f890448caa1e9.tar.gz
Essentials-459f1b70cb255a9e6f528025018f890448caa1e9.tar.lz
Essentials-459f1b70cb255a9e6f528025018f890448caa1e9.tar.xz
Essentials-459f1b70cb255a9e6f528025018f890448caa1e9.zip
Compile time fixes.
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeServer.java11
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeWorld.java6
-rw-r--r--pom.xml2
3 files changed, 14 insertions, 5 deletions
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index d8ce82439..552c0c419 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -6,8 +6,8 @@ import java.util.*;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import java.util.logging.Logger;
-import org.bukkit.World.Environment;
import org.bukkit.*;
+import org.bukkit.World.Environment;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.command.PluginCommand;
@@ -19,9 +19,6 @@ import org.bukkit.event.inventory.InventoryType;
import org.bukkit.help.HelpMap;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.help.HelpMap;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.Recipe;
import org.bukkit.map.MapView;
@@ -922,4 +919,10 @@ public class FakeServer implements Server
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public boolean isPrimaryThread()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/Essentials/test/com/earth2me/essentials/FakeWorld.java b/Essentials/test/com/earth2me/essentials/FakeWorld.java
index 1af6fd3cf..c389a3f37 100644
--- a/Essentials/test/com/earth2me/essentials/FakeWorld.java
+++ b/Essentials/test/com/earth2me/essentials/FakeWorld.java
@@ -669,4 +669,10 @@ public class FakeWorld implements World
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public Entity spawnEntity(Location loc, EntityType type)
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/pom.xml b/pom.xml
index 3370c22fa..0d45ef8e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bukkit.version>1.2.5-R4.0</bukkit.version>
+ <bukkit.version>1.2.5-R4.1-SNAPSHOT</bukkit.version>
<build.number>Unknown</build.number>
<org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>true</org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs>
<org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>2</org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width>