diff options
author | KHobbits <rob@khobbits.co.uk> | 2014-04-06 15:50:18 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2014-04-06 15:57:37 +0100 |
commit | 737fadc39092761495722f52f5db6668f0cdc12b (patch) | |
tree | bd0016565cae1e26bf4b59849f9f74974741556c | |
parent | 10de6ac929b19843c37d30c8d7d8dc4371440625 (diff) | |
download | Essentials-737fadc39092761495722f52f5db6668f0cdc12b.tar Essentials-737fadc39092761495722f52f5db6668f0cdc12b.tar.gz Essentials-737fadc39092761495722f52f5db6668f0cdc12b.tar.lz Essentials-737fadc39092761495722f52f5db6668f0cdc12b.tar.xz Essentials-737fadc39092761495722f52f5db6668f0cdc12b.zip |
Update Bukkit 1.7.5-R0.1
Bukkit 1919 CB: 3039
No UUID update yet.
-rw-r--r-- | Essentials/pom.xml | 15 | ||||
-rw-r--r-- | Essentials/src/com/earth2me/essentials/OfflinePlayer.java | 13 | ||||
-rw-r--r-- | Essentials/test/com/earth2me/essentials/FakeServer.java | 18 | ||||
-rw-r--r-- | lib/bukkit.jar | bin | 4939181 -> 4939727 bytes | |||
-rw-r--r-- | lib/craftbukkit.jar | bin | 19972216 -> 19989321 bytes |
5 files changed, 37 insertions, 9 deletions
diff --git a/Essentials/pom.xml b/Essentials/pom.xml index 3da8e33c9..633005206 100644 --- a/Essentials/pom.xml +++ b/Essentials/pom.xml @@ -40,8 +40,19 @@ <system>TeamCity</system> <url>http://ci.ess3.net/</url> </ciManagement> - - <dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <showDeprecation>true</showDeprecation> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> <dependency> <groupId>org.bukkit</groupId> <artifactId>bukkit</artifactId> diff --git a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java index de183e5f0..5fbdb289d 100644 --- a/Essentials/src/com/earth2me/essentials/OfflinePlayer.java +++ b/Essentials/src/com/earth2me/essentials/OfflinePlayer.java @@ -30,7 +30,6 @@ public class OfflinePlayer implements Player private final transient IEssentials ess; private transient Location location = new Location(null, 0, 0, 0, 0, 0); private transient World world; - private final transient UUID uniqueId = UUID.randomUUID(); @Delegate(types = org.bukkit.OfflinePlayer.class) private transient org.bukkit.OfflinePlayer base; private boolean allowFlight = false; @@ -637,12 +636,6 @@ public class OfflinePlayer implements Player } @Override - public UUID getUniqueId() - { - return uniqueId; - } - - @Override public void playNote(Location lctn, Instrument i, Note note) { throw new UnsupportedOperationException("Not supported yet."); @@ -1434,4 +1427,10 @@ public class OfflinePlayer implements Player { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public void sendSignChange(Location arg0, String[] arg1) throws IllegalArgumentException + { + 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 29ff2ed42..20b098b0c 100644 --- a/Essentials/test/com/earth2me/essentials/FakeServer.java +++ b/Essentials/test/com/earth2me/essentials/FakeServer.java @@ -784,6 +784,12 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public UUID getUniqueId() + { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } }; } @@ -1201,4 +1207,16 @@ public class FakeServer implements Server { throw new UnsupportedOperationException("Not supported yet."); } + + @Override + public Player getPlayer(UUID arg0) + { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } + + @Override + public OfflinePlayer getOfflinePlayer(UUID arg0) + { + throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + } } diff --git a/lib/bukkit.jar b/lib/bukkit.jar Binary files differindex 3d81db136..ba71a534e 100644 --- a/lib/bukkit.jar +++ b/lib/bukkit.jar diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar Binary files differindex 2f59a449b..25db406ac 100644 --- a/lib/craftbukkit.jar +++ b/lib/craftbukkit.jar |