Skip to content

Commit

Permalink
Update Bukkit 1.7.5-R0.1
Browse files Browse the repository at this point in the history
Bukkit 1919 CB: 3039
No UUID update yet.
  • Loading branch information
khobbits committed Apr 6, 2014
1 parent 10de6ac commit 737fadc
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 9 deletions.
15 changes: 13 additions & 2 deletions Essentials/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 6 additions & 7 deletions Essentials/src/com/earth2me/essentials/OfflinePlayer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -636,12 +635,6 @@ public boolean sendChunkChange(Location lctn, int i, int i1, int i2, byte[] byte
return true;
}

@Override
public UUID getUniqueId()
{
return uniqueId;
}

@Override
public void playNote(Location lctn, Instrument i, Note note)
{
Expand Down Expand Up @@ -1434,4 +1427,10 @@ public <T extends Projectile> T launchProjectile(Class<? extends T> type, Vector
{
throw new UnsupportedOperationException("Not supported yet.");
}

@Override
public void sendSignChange(Location arg0, String[] arg1) throws IllegalArgumentException
{
throw new UnsupportedOperationException("Not supported yet.");
}
}
18 changes: 18 additions & 0 deletions Essentials/test/com/earth2me/essentials/FakeServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,12 @@ public Location getBedSpawnLocation()
{
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.
}
};
}

Expand Down Expand Up @@ -1201,4 +1207,16 @@ public BanList getBanList(BanList.Type arg0)
{
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.
}
}
Binary file modified lib/bukkit.jar
Binary file not shown.
Binary file modified lib/craftbukkit.jar
Binary file not shown.

0 comments on commit 737fadc

Please sign in to comment.