Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0478e1180a
2 changed files with 4 additions and 3 deletions
|
@ -102,11 +102,11 @@ public class ChatReceivedEvent {
|
||||||
Utils.addTitle("You got sent to Limbo or Lobby!");
|
Utils.addTitle("You got sent to Limbo or Lobby!");
|
||||||
Flipper.state = FlipperState.NONE;
|
Flipper.state = FlipperState.NONE;
|
||||||
if (Lilase.cofl.isOpen()) Lilase.cofl.toggleAuction();
|
if (Lilase.cofl.isOpen()) Lilase.cofl.toggleAuction();
|
||||||
Thread.sleep(5000 + new Random().nextInt(500));
|
Thread.sleep(30000 + new Random().nextInt(5000));
|
||||||
Utils.sendServerMessage("/lobby");
|
Utils.sendServerMessage("/lobby");
|
||||||
Thread.sleep(5000 + new Random().nextInt(500));
|
Thread.sleep(30000 + new Random().nextInt(5000));
|
||||||
Utils.sendServerMessage("/skyblock");
|
Utils.sendServerMessage("/skyblock");
|
||||||
Thread.sleep(5000 + new Random().nextInt(500));
|
Thread.sleep(30000 + new Random().nextInt(5000));
|
||||||
Utils.sendServerMessage("/hub");
|
Utils.sendServerMessage("/hub");
|
||||||
if (!Lilase.cofl.isOpen()) Lilase.cofl.toggleAuction();
|
if (!Lilase.cofl.isOpen()) Lilase.cofl.toggleAuction();
|
||||||
// Thread bzchillingthread = new Thread(bazaarChilling);
|
// Thread bzchillingthread = new Thread(bazaarChilling);
|
||||||
|
|
|
@ -353,6 +353,7 @@ public class Flipper {
|
||||||
.addField("Item:", name, true)
|
.addField("Item:", name, true)
|
||||||
.addField("Price:", format.format(price), true)
|
.addField("Price:", format.format(price), true)
|
||||||
.addField("Target Price:", format.format(target), true)
|
.addField("Target Price:", format.format(target), true)
|
||||||
|
.addField("Profit:", df.format(target - price), true)
|
||||||
.addField("Profit Percentage:", df.format((double) (target - price) / price * 100f) + "%", true)
|
.addField("Profit Percentage:", df.format((double) (target - price) / price * 100f) + "%", true)
|
||||||
.setColor(Color.decode(color));
|
.setColor(Color.decode(color));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue