summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIaccidentally <coryhuckaby@gmail.com>2013-04-16 16:59:36 -0400
committerIaccidentally <coryhuckaby@gmail.com>2013-04-16 16:59:36 -0400
commiteeb31e054f9d112c03fa391a19acbc954684c294 (patch)
tree3f8d4dc5ab314f56e2688ff17015cfb69f5abef4
parent4629cad99bb85d852fcbe7e32cb19563ea43e552 (diff)
downloadEssentials-eeb31e054f9d112c03fa391a19acbc954684c294.tar
Essentials-eeb31e054f9d112c03fa391a19acbc954684c294.tar.gz
Essentials-eeb31e054f9d112c03fa391a19acbc954684c294.tar.lz
Essentials-eeb31e054f9d112c03fa391a19acbc954684c294.tar.xz
Essentials-eeb31e054f9d112c03fa391a19acbc954684c294.zip
[UPDATE] Update to 1.5.1-r0.2 beta build
-rw-r--r--Essentials/src/com/earth2me/essentials/Essentials.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/OfflinePlayer.java15
-rw-r--r--Essentials/test/com/earth2me/essentials/FakeServer.java7
-rw-r--r--lib/bukkit.jarbin4848133 -> 4862339 bytes
-rw-r--r--lib/craftbukkit.jarbin12920218 -> 12958013 bytes
5 files changed, 22 insertions, 2 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Essentials.java b/Essentials/src/com/earth2me/essentials/Essentials.java
index 9582c3d58..a784eb5fb 100644
--- a/Essentials/src/com/earth2me/essentials/Essentials.java
+++ b/Essentials/src/com/earth2me/essentials/Essentials.java
@@ -69,7 +69,7 @@ import org.yaml.snakeyaml.error.YAMLException;
public class Essentials extends JavaPlugin implements IEssentials
{
- public static final int BUKKIT_VERSION = 2648;
+ public static final int BUKKIT_VERSION = 2754;
private static final Logger LOGGER = Logger.getLogger("Minecraft");
private transient ISettings settings;
private final transient TNTExplodeListener tntListener = new TNTExplodeListener(this);
diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
index 1d4dff32d..d78ff7146 100644
--- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
+++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java
@@ -11,8 +11,8 @@ import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.entity.*;
import org.bukkit.event.entity.EntityDamageEvent;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.inventory.InventoryView.Property;
import org.bukkit.inventory.*;
+import org.bukkit.inventory.InventoryView.Property;
import org.bukkit.map.MapView;
import org.bukkit.metadata.MetadataValue;
import org.bukkit.permissions.Permission;
@@ -21,6 +21,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
+import org.bukkit.scoreboard.Scoreboard;
import org.bukkit.util.Vector;
public class OfflinePlayer implements Player
@@ -1216,4 +1217,16 @@ public class OfflinePlayer implements Player
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public Scoreboard getScoreboard()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
+
+ @Override
+ public void setScoreboard(Scoreboard scrbrd) throws IllegalArgumentException, IllegalStateException
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/Essentials/test/com/earth2me/essentials/FakeServer.java b/Essentials/test/com/earth2me/essentials/FakeServer.java
index 9247d417b..94e1bb6cb 100644
--- a/Essentials/test/com/earth2me/essentials/FakeServer.java
+++ b/Essentials/test/com/earth2me/essentials/FakeServer.java
@@ -25,6 +25,7 @@ import org.bukkit.plugin.messaging.Messenger;
import org.bukkit.scheduler.BukkitScheduler;
import org.bukkit.scheduler.BukkitTask;
import org.bukkit.scheduler.BukkitWorker;
+import org.bukkit.scoreboard.ScoreboardManager;
public class FakeServer implements Server
@@ -819,4 +820,10 @@ public class FakeServer implements Server
{
throw new UnsupportedOperationException("Not supported yet.");
}
+
+ @Override
+ public ScoreboardManager getScoreboardManager()
+ {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/lib/bukkit.jar b/lib/bukkit.jar
index 3a5dcd6da..132be4eee 100644
--- a/lib/bukkit.jar
+++ b/lib/bukkit.jar
Binary files differ
diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar
index 79003e70c..4fa6effd5 100644
--- a/lib/craftbukkit.jar
+++ b/lib/craftbukkit.jar
Binary files differ