Skip to content
This repository was archived by the owner on Feb 8, 2019. It is now read-only.

Commit 2582bdf

Browse files
committed
やっぱ他のAPI使う()
1 parent 58c539d commit 2582bdf

File tree

6 files changed

+31
-92
lines changed

6 files changed

+31
-92
lines changed

plugin.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: TheMix
22
main: VectorNetworkProject\TheMix\TheMix
33
api: 3.0.0
4+
softdepend:
5+
- ScoreboardsPE
46

57
description: "Original game of VectorNetwork"
68
website: "https://vector-network.tk"

src/VectorNetworkProject/TheMix/TheMix.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use VectorNetworkProject\TheMix\event\ThePlayerJoinEvent;
1717
use VectorNetworkProject\TheMix\event\ThePlayerLoginEvent;
1818
use VectorNetworkProject\TheMix\event\ThePlayerQuitEvent;
19-
use VectorNetworkProject\TheMix\task\UpdateScoreboardTask;
2019

2120
class TheMix extends PluginBase
2221
{
@@ -33,7 +32,6 @@ public function onEnable()
3332
{
3433
$this->registerCommands();
3534
$this->registerEvents();
36-
$this->getScheduler()->scheduleRepeatingTask(new UpdateScoreboardTask(), 20);
3735
$this->getLogger()->notice(TextFormat::AQUA . '
3836
3937

src/VectorNetworkProject/TheMix/event/ThePlayerJoinEvent.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,20 @@
1111

1212
use pocketmine\event\Listener;
1313
use pocketmine\event\player\PlayerJoinEvent;
14-
use VectorNetworkProject\TheMix\lib\scoreboard\Scoreboard;
14+
use Miste\scoreboardspe\API\{
15+
Scoreboard, ScoreboardDisplaySlot, ScoreboardSort, ScoreboardAction
16+
};
17+
use VectorNetworkProject\TheMix\task\UpdateScoreboardTask;
18+
use VectorNetworkProject\TheMix\TheMix;
1519

1620
class ThePlayerJoinEvent implements Listener
1721
{
1822
public function event(PlayerJoinEvent $event)
1923
{
2024
$player = $event->getPlayer();
21-
Scoreboard::addBoard($player);
25+
$scoreboard = new Scoreboard(TheMix::getInstance()->getServer()->getPluginManager()->getPlugin("ScoreboardsPE")->getPlugin(), "§l§eTHE VECTOR PIT", ScoreboardAction::CREATE);
26+
$scoreboard->create(ScoreboardDisplaySlot::SIDEBAR, ScoreboardSort::DESCENDING);
27+
$scoreboard->addDisplay($player);
28+
TheMix::getInstance()->getScheduler()->scheduleRepeatingTask(new UpdateScoreboardTask($scoreboard, $player), 20);
2229
}
2330
}

src/VectorNetworkProject/TheMix/event/ThePlayerQuitEvent.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111

1212
use pocketmine\event\Listener;
1313
use pocketmine\event\player\PlayerQuitEvent;
14-
use VectorNetworkProject\TheMix\lib\scoreboard\Scoreboard;
1514

1615
class ThePlayerQuitEvent implements Listener
1716
{
1817
public function event(PlayerQuitEvent $event)
1918
{
2019
$player = $event->getPlayer();
21-
Scoreboard::removeBoard($player);
2220
}
2321
}

src/VectorNetworkProject/TheMix/lib/scoreboard/Scoreboard.php

Lines changed: 0 additions & 80 deletions
This file was deleted.

src/VectorNetworkProject/TheMix/task/UpdateScoreboardTask.php

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,32 @@
99
namespace VectorNetworkProject\TheMix\task;
1010

1111

12+
use pocketmine\Player;
1213
use pocketmine\scheduler\Task;
14+
use Miste\scoreboardspe\API\{
15+
Scoreboard, ScoreboardDisplaySlot, ScoreboardSort, ScoreboardAction
16+
};
1317
use pocketmine\Server;
14-
use VectorNetworkProject\TheMix\lib\scoreboard\Scoreboard;
1518

1619
class UpdateScoreboardTask extends Task
1720
{
21+
/* @var Scoreboard $scoreboard */
22+
private $scoreboard;
23+
/* @var Player $player */
24+
private $player;
25+
26+
public function __construct(Scoreboard $scoreboard, Player $player)
27+
{
28+
$this->scoreboard = $scoreboard;
29+
$this->player = $player;
30+
}
31+
1832
public function onRun(int $currentTick)
1933
{
20-
foreach (Server::getInstance()->getOnlinePlayers() as $player) {
21-
Scoreboard::setLine($player, 1, 'test');
22-
Scoreboard::setLine($player, 2, ' ');
23-
Scoreboard::setLine($player, 3, 'test');
24-
}
34+
if (!$this->player->isOnline()) $this->getHandler()->cancel();
35+
$scoreboard = $this->scoreboard;
36+
$scoreboard->setLine($this->player, 0, '§7' . date("Y/m/d H:i:s"));
37+
$scoreboard->setLine($this->player, 2, "Players: " . count(Server::getInstance()->getOnlinePlayers()) . "/" . Server::getInstance()->getMaxPlayers());
38+
$scoreboard->setLine($this->player, 3, "§ewww.vector-network.tk ");
2539
}
2640
}

0 commit comments

Comments
 (0)