Skip to content

Commit 38e0810

Browse files
Fix non-converted schedulers
1 parent 34fefc1 commit 38e0810

File tree

6 files changed

+22
-15
lines changed

6 files changed

+22
-15
lines changed

pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@
189189
<pattern>org.bstats</pattern>
190190
<shadedPattern>com.gmail.nossr50.mcmmo.metrics.bstats</shadedPattern>
191191
</relocation>
192+
<relocation>
193+
<pattern>com.tcoded.folialib</pattern>
194+
<shadedPattern>com.gmail.nossr50.mcmmo.folialib</shadedPattern>
195+
</relocation>
192196
</relocations>
193197
</configuration>
194198
<executions>
@@ -379,7 +383,7 @@
379383
<dependency>
380384
<groupId>com.tcoded</groupId>
381385
<artifactId>FoliaLib</artifactId>
382-
<version>0.2.0</version>
386+
<version>0.2.4</version>
383387
<scope>compile</scope>
384388
</dependency>
385389
</dependencies>

src/main/java/com/gmail/nossr50/listeners/BlockListener.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,15 @@ public void onBlockPistonExtend(BlockPistonExtendEvent event) {
136136

137137
final BlockFace direction = event.getDirection();
138138

139-
Bukkit.getScheduler().scheduleSyncDelayedTask(mcMMO.p, () -> {
140139
for (final Block block : event.getBlocks()) {
141-
final Block movedBlock = block.getRelative(direction);
140+
mcMMO.p.getFoliaLib().getImpl().runAtLocation(block.getLocation(), () -> {
141+
final Block movedBlock = block.getRelative(direction);
142142

143-
if(BlockUtils.isWithinWorldBounds(movedBlock)) {
144-
BlockUtils.setUnnaturalBlock(movedBlock);
145-
}
146-
}});
143+
if (BlockUtils.isWithinWorldBounds(movedBlock)) {
144+
BlockUtils.setUnnaturalBlock(movedBlock);
145+
}
146+
});
147+
}
147148
}
148149

149150
/**

src/main/java/com/gmail/nossr50/mcMMO.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
import com.gmail.nossr50.util.upgrade.UpgradeManager;
5555
import com.gmail.nossr50.worldguard.WorldGuardManager;
5656
import com.tcoded.folialib.FoliaLib;
57+
import com.tcoded.folialib.impl.ServerImplementation;
5758
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
5859
import net.shatteredlands.shatt.backup.ZipLibrary;
5960
import org.bstats.bukkit.Metrics;
@@ -400,7 +401,7 @@ public void onDisable() {
400401
}
401402

402403
LogUtils.debug(mcMMO.p.getLogger(), "Canceling all tasks...");
403-
getServer().getScheduler().cancelTasks(this); // This removes our tasks
404+
getFoliaLib().getImpl().cancelAllTasks(); // This removes our tasks
404405
LogUtils.debug(mcMMO.p.getLogger(), "Unregister all events...");
405406
HandlerList.unregisterAll(this); // Cancel event registrations
406407

@@ -630,11 +631,11 @@ private void registerCoreSkills() {
630631
}
631632

632633
private void registerCustomRecipes() {
633-
getServer().getScheduler().scheduleSyncDelayedTask(this, () -> {
634+
getFoliaLib().getImpl().runLater(() -> {
634635
if (generalConfig.getChimaeraEnabled()) {
635636
getServer().addRecipe(ChimaeraWing.getChimaeraWingRecipe());
636637
}
637-
}, 40);
638+
}, 40 * 50, TimeUnit.MILLISECONDS);
638639
}
639640

640641
private void scheduleTasks() {
@@ -647,7 +648,7 @@ private void scheduleTasks() {
647648
new SaveTimerTask().runTaskTimer(saveIntervalTicks, saveIntervalTicks);
648649

649650
// Cleanup the backups folder
650-
new CleanBackupsTask().runTaskAsynchronously(mcMMO.p);
651+
getFoliaLib().getImpl().runAsync(new CleanBackupsTask());
651652

652653
// Old & Powerless User remover
653654
long purgeIntervalTicks = generalConfig.getPurgeInterval() * 60L * 60L * Misc.TICK_CONVERSION_FACTOR;

src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import com.gmail.nossr50.util.LogUtils;
88
import com.gmail.nossr50.util.Misc;
99
import com.gmail.nossr50.util.player.UserManager;
10-
import com.tcoded.folialib.wrapper.WrappedTask;
10+
import com.tcoded.folialib.wrapper.task.WrappedTask;
1111

1212
import java.util.concurrent.TimeUnit;
1313

src/main/java/com/gmail/nossr50/util/player/NotificationManager.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.jetbrains.annotations.NotNull;
3232

3333
import java.time.LocalDate;
34+
import java.util.concurrent.TimeUnit;
3435

3536
public class NotificationManager {
3637

@@ -296,7 +297,7 @@ public static void processLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlayer, @N
296297
String localeMessage = LocaleLoader.getString("Broadcasts.LevelUpMilestone", mmoPlayer.getPlayer().getDisplayName(), level, mcMMO.p.getSkillTools().getLocalizedSkillName(primarySkillType));
297298
Component message = LegacyComponentSerializer.legacySection().deserialize(localeMessage).hoverEvent(levelMilestoneHover);
298299

299-
Bukkit.getScheduler().runTaskLater(mcMMO.p, () -> audience.sendMessage(Identity.nil(), message), 0);
300+
mcMMO.p.getFoliaLib().getImpl().runNextTick(() -> audience.sendMessage(Identity.nil(), message));
300301
}
301302
}
302303
}
@@ -331,7 +332,7 @@ public static void processPowerLevelUpBroadcasting(@NotNull McMMOPlayer mmoPlaye
331332
String localeMessage = LocaleLoader.getString("Broadcasts.PowerLevelUpMilestone", mmoPlayer.getPlayer().getDisplayName(), powerLevel);
332333
Component message = LegacyComponentSerializer.legacySection().deserialize(localeMessage).hoverEvent(levelMilestoneHover);
333334

334-
Bukkit.getScheduler().runTaskLater(mcMMO.p, () -> audience.sendMessage(Identity.nil(), message), 0);
335+
mcMMO.p.getFoliaLib().getImpl().runNextTick(() -> audience.sendMessage(Identity.nil(), message));
335336
}
336337
}
337338
}

src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import com.gmail.nossr50.util.player.UserManager;
1919
import com.gmail.nossr50.util.scoreboards.ScoreboardManager.SidebarType;
2020
import com.gmail.nossr50.util.skills.SkillTools;
21-
import com.tcoded.folialib.wrapper.WrappedTask;
21+
import com.tcoded.folialib.wrapper.task.WrappedTask;
2222
import org.apache.commons.lang.Validate;
2323
import org.bukkit.ChatColor;
2424
import org.bukkit.entity.Player;

0 commit comments

Comments
 (0)