Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixed scorehud.world_player_count not counting player count correctly #207

Merged
merged 6 commits into from
Aug 7, 2023
Merged

Fixed scorehud.world_player_count not counting player count correctly #207

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9eb6301
Fixed `scorehud.world_player_count` not counting the teleported player
JavierLeon9966 Dec 27, 2022
bf7e969
Fixed counting an extra player when teleporting to the same world
JavierLeon9966 Dec 27, 2022
8d99b38
Fixed world player count score tag not updating when a player leaves …
JavierLeon9966 Dec 27, 2022
6015a1b
Make `world_player_count` tag per player, so it doesn't change for ev…
JavierLeon9966 Jan 5, 2023
f5a6209
Broadcast the score tag to the teleported player too
JavierLeon9966 Jan 6, 2023
5feb4dd
Update `world_player_count` for the players in the previous world
JavierLeon9966 Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 32 additions & 6 deletions src/Ifera/ScoreHud/factory/listener/FactoryListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,21 @@ public function __construct(

public function onJoin(PlayerJoinEvent $event) {
(new ServerTagUpdateEvent(new ScoreTag("scorehud.online", (string) count($this->plugin->getServer()->getOnlinePlayers()))))->call();
}
$worldPlayers = $event->getPlayer()->getWorld()->getPlayers();
$worldCount = count($worldPlayers);
foreach ($worldPlayers as $player) {
(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.world_player_count", (string) $worldCount)))->call();
}
}

public function onQuit(PlayerQuitEvent $event) {
$this->plugin->getScheduler()->scheduleDelayedTask(new ClosureTask(function(): void {
$this->plugin->getScheduler()->scheduleDelayedTask(new ClosureTask(function() use($event): void {
(new ServerTagUpdateEvent(new ScoreTag("scorehud.online", (string) count($this->plugin->getServer()->getOnlinePlayers()))))->call();
$worldPlayers = $event->getPlayer()->getWorld()->getPlayers();
$worldCount = count($worldPlayers);
foreach ($worldPlayers as $player) {
(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.world_player_count", (string) $worldCount)))->call();
}
}), 20);
}

Expand Down Expand Up @@ -78,12 +88,28 @@ public function onMove(PlayerMoveEvent $event) {
public function onTeleport(EntityTeleportEvent $event) {
$player = $event->getEntity();
$target = $event->getTo()->getWorld();
$prevWorld = $event->getFrom()->getWorld();

if (!$player instanceof Player) return;

(new ServerTagUpdateEvent(new ScoreTag("scorehud.world_player_count", (string) count($target->getPlayers()))))->call();

(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.level_name", $target->getDisplayName())))->call();
$worldPlayers = $target->getPlayers();
$prevWorldPlayers = $prevWorld->getPlayers();
if($target !== $event->getFrom()->getWorld()){
$worldCount = count($worldPlayers) + 1;
$worldPlayers[$player->getId()] = $player;
$prevWorldCount = count($prevWorldPlayers) - 1;
unset($prevWorldPlayers[$player->getId()]);
foreach ($prevWorldPlayers as $prevWorldPlayer) {
(new PlayerTagUpdateEvent($prevWorldPlayer, new ScoreTag("scorehud.world_player_count", (string) $prevWorldCount)))->call();
}
}else{
$worldCount = count($worldPlayers);
}
foreach ($worldPlayers as $worldPlayer) {
(new PlayerTagUpdateEvent($worldPlayer, new ScoreTag("scorehud.world_player_count", (string) $worldCount)))->call();
}

(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.level_name", $target->getDisplayName())))->call();
(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.world_name", $target->getDisplayName())))->call();

(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.level_folder_name", $target->getFolderName())))->call();
Expand All @@ -98,4 +124,4 @@ public function onItemHeld(PlayerItemHeldEvent $event) {
(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.item_meta", (string) $item->getMeta())))->call();
(new PlayerTagUpdateEvent($player, new ScoreTag("scorehud.item_count", (string) $item->getCount())))->call();
}
}
}