Fork/Velocitab
2
0
Fork 0
forked from Upstream/Velocitab
Code Pull Requests Actions Releases Activity

Fix for https://github.com/WiIIiam278/Velocitab/issues/144

Browse Source
This commit is contained in:
AlexDev_ 2024-01-17 21:02:24 +01:00
parent e496c99a52
commit 9e60fc0daa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/william278/velocitab/hook/LuckPermsHook.java
View File

@ -19,6 +19,7 @@
package net.william278.velocitab.hook; package net.william278.velocitab.hook;
import com.google.common.collect.Maps;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import net.luckperms.api.LuckPerms; import net.luckperms.api.LuckPerms;
import net.luckperms.api.LuckPermsProvider; import net.luckperms.api.LuckPermsProvider;
@ -34,7 +35,6 @@ import net.william278.velocitab.tab.PlayerTabList;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@ -49,7 +49,7 @@ public class LuckPermsHook extends Hook {
public LuckPermsHook(@NotNull Velocitab plugin) throws IllegalStateException { public LuckPermsHook(@NotNull Velocitab plugin) throws IllegalStateException {
super(plugin); super(plugin);
this.api = LuckPermsProvider.get(); this.api = LuckPermsProvider.get();
this.lastUpdate = new HashMap<>(); this.lastUpdate = Maps.newConcurrentMap();
this.event = api.getEventBus().subscribe( this.event = api.getEventBus().subscribe(
plugin, UserDataRecalculateEvent.class, this::onLuckPermsGroupUpdate plugin, UserDataRecalculateEvent.class, this::onLuckPermsGroupUpdate
); );

4
src/main/java/net/william278/velocitab/packet/PacketEventManager.java
View File

@ -101,6 +101,7 @@ public class PacketEventManager {
.map(id -> plugin.getTabList().getTabPlayer(id)) .map(id -> plugin.getTabList().getTabPlayer(id))
.filter(Optional::isPresent) .filter(Optional::isPresent)
.map(Optional::get) .map(Optional::get)
.filter(TabPlayer::isLoaded)
.toList(); .toList();
if (toUpdate.isEmpty()) { if (toUpdate.isEmpty()) {
@ -108,8 +109,7 @@ public class PacketEventManager {
} }
toUpdate.forEach(tabPlayer -> packet.getEntries().stream() toUpdate.forEach(tabPlayer -> packet.getEntries().stream()
.filter(entry -> entry.getProfile() != null) .filter(entry -> entry.getProfileId().equals(tabPlayer.getPlayer().getUniqueId()))
.filter(entry -> entry.getProfile().getId().equals(tabPlayer.getPlayer().getUniqueId()))
.findFirst() .findFirst()
.ifPresent(entry -> entry.setDisplayName( .ifPresent(entry -> entry.setDisplayName(
new ComponentHolder(player.getProtocolVersion(), tabPlayer.getLastDisplayname())))); new ComponentHolder(player.getProtocolVersion(), tabPlayer.getLastDisplayname()))));