From 737fadc39092761495722f52f5db6668f0cdc12b Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 6 Apr 2014 15:50:18 +0100 Subject: Update Bukkit 1.7.5-R0.1 Bukkit 1919 CB: 3039 No UUID update yet. --- Essentials/pom.xml | 15 +++++++++++++-- .../src/com/earth2me/essentials/OfflinePlayer.java | 13 ++++++------- .../test/com/earth2me/essentials/FakeServer.java | 18 ++++++++++++++++++ lib/bukkit.jar | Bin 4939181 -> 4939727 bytes 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 @@ TeamCity http://ci.ess3.net/ - - + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + true + + + + + org.bukkit bukkit 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; @@ -636,12 +635,6 @@ public class OfflinePlayer implements Player return true; } - @Override - public UUID getUniqueId() - { - return uniqueId; - } - @Override public void playNote(Location lctn, Instrument i, Note note) { @@ -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 index 3d81db136..ba71a534e 100644 Binary files a/lib/bukkit.jar and b/lib/bukkit.jar differ diff --git a/lib/craftbukkit.jar b/lib/craftbukkit.jar index 2f59a449b..25db406ac 100644 Binary files a/lib/craftbukkit.jar and b/lib/craftbukkit.jar differ -- cgit v1.2.3