Skip to content

Commit 4715865

Browse files
committed
use folia's entity scheduler (keep code in line with latest packetevents commits)
1 parent 0c02c4d commit 4715865

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

spigot/src/main/java/io/github/retrooper/packetevents/bukkit/InternalBukkitListener.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public InternalBukkitListener(Plugin plugin) {
4646
// finished logging in and has a channel reference set, for 1.20.2+
4747
@EventHandler(priority = EventPriority.LOWEST)
4848
public void onLogin(PlayerSpawnLocationEvent event) {
49+
System.out.println("First factual: " + event.getPlayer().getName());
4950
if (PacketEvents.getAPI().getServerManager().getVersion().isNewerThanOrEquals(ServerVersion.V_1_20_2)) {
5051
this.onLogin(event.getPlayer());
5152
}
@@ -56,12 +57,14 @@ public void onLogin(PlayerSpawnLocationEvent event) {
5657
// (and according to tests this doesn't really happen much in versions older than 1.20.2)
5758
@EventHandler(priority = EventPriority.HIGH)
5859
public void onJoin(PlayerJoinEvent event) {
60+
System.out.println("Second factual: " + event.getPlayer().getName());
5961
if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_20_2)) {
6062
this.onLogin(event.getPlayer());
6163
}
6264
}
6365

6466
private void onLogin(Player player) {
67+
System.out.println("PLAYER LOGGED ON: " + player.getName());
6568
SpigotChannelInjector injector = (SpigotChannelInjector) PacketEvents.getAPI().getInjector();
6669

6770
User user = PacketEvents.getAPI().getPlayerManager().getUser(player);
@@ -71,9 +74,9 @@ private void onLogin(Player player) {
7174
//Check if it is a fake connection...
7275
if (channel == null || !FakeChannelUtil.isFakeChannel(channel) && (!PacketEvents.getAPI().isTerminated() || PacketEvents.getAPI().getSettings().isKickIfTerminated())) {
7376
//Kick them, if they are not a fake player.
74-
FoliaScheduler.getRegionScheduler().runDelayed(plugin, player.getLocation(), (o) -> {
77+
FoliaScheduler.getEntityScheduler().runDelayed(player, plugin, (o) -> {
7578
player.kickPlayer("PacketEvents 2.0 failed to inject");
76-
}, 0);
79+
}, null, 0);
7780
}
7881
return;
7982
}

0 commit comments

Comments
 (0)