Merge remote-tracking branch 'refs/remotes/origin/develop' into mopple

This commit is contained in:
Sam 2016-05-30 23:21:38 +01:00
commit 55317730fa
2 changed files with 1 additions and 4 deletions

View File

@ -31,7 +31,7 @@ public class BillboardManager extends MiniPlugin
private void generateBoards() private void generateBoards()
{ {
_branding.createPost(new Location(Bukkit.getWorld("world"), -6, 78, -35), BlockFace.SOUTH, "logitech.jpg");
} }
@EventHandler @EventHandler

View File

@ -182,9 +182,6 @@ public class SpeedBuilders extends SoloGame
InventoryClick = true; InventoryClick = true;
manager.getBrandingManager().reset();
manager.getBrandingManager().createPost(new Location(Bukkit.getWorld("world"), 17, 103, -11), BlockFace.WEST, "logitech.jpg");
registerStatTrackers( registerStatTrackers(
new DependableTracker(this), new DependableTracker(this),
new FirstBuildTracker(this), new FirstBuildTracker(this),