SteamWar/SpigotCore
Archiviert
13
0

Merge pull request 'Force tinyprotocol injection' (#177) from forceInjection into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #177
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
Dieser Commit ist enthalten in:
Lixfel 2022-03-05 22:12:19 +01:00
Commit 3b6be14958

Datei anzeigen

@ -92,15 +92,18 @@ public class TinyProtocol {
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerLogin(PlayerLoginEvent e) {
if (closed)
return;
Channel channel = getChannel(e.getPlayer());
// Don't inject players that have been explicitly uninjected
if (!uninjectedChannels.contains(channel)) {
injectPlayer(e.getPlayer());
}
injectPlayerOnLogin(
e.getPlayer(),
() -> Bukkit.getScheduler().runTask(plugin, () -> injectPlayerOnLogin(
e.getPlayer(),
() -> Bukkit.getScheduler().runTaskLater(plugin, () -> injectPlayerOnLogin(
e.getPlayer(),
() -> {
//Give up
}
), 1)
))
);
}
@EventHandler
@ -130,6 +133,23 @@ public class TinyProtocol {
}
}
private void injectPlayerOnLogin(Player player, Runnable errorHandler) {
if (closed)
return;
try {
Channel channel = getChannel(player);
// Don't inject players that have been explicitly uninjected
if (!uninjectedChannels.contains(channel)) {
injectPlayer(player);
}
} catch (NullPointerException ex) {
Bukkit.getLogger().log(Level.WARNING, player.getName() + " without playerConnection, retrying");
errorHandler.run();
}
}
private void createServerChannelHandler() {
// Handle connected channels
endInitProtocol = new ChannelInitializer<Channel>() {