Skip to content

Commit bc6e4bc

Browse files
committed
fix Folia throwing IllegalArgumentException
1 parent 44b2255 commit bc6e4bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+79
-79
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@
459459
<dependency>
460460
<groupId>com.github.technicallycoded</groupId>
461461
<artifactId>FoliaLib</artifactId>
462-
<version>main-SNAPSHOT</version>
462+
<version>dev-SNAPSHOT</version>
463463
<scope>compile</scope>
464464
</dependency>
465465
</dependencies>

src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
6464
mcMMO.getDatabaseManager().saveUser(profile);
6565
}
6666

67-
mcMMO.p.getFoliaLib().getImpl().runLaterAsync(new PlayerProfileLoadingTask(player), 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
67+
mcMMO.p.getFoliaLib().getScheduler().runLaterAsync(new PlayerProfileLoadingTask(player), 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
6868
}
6969

70-
mcMMO.p.getFoliaLib().getImpl().runAsync(new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()));
70+
mcMMO.p.getFoliaLib().getScheduler().runAsync(new DatabaseConversionTask(oldDatabase, sender, previousType.toString(), newType.toString()));
7171
return true;
7272
}
7373
return false;

src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
3636
UserManager.saveAll();
3737
UserManager.clearAll();
3838

39-
mcMMO.p.getFoliaLib().getImpl().runLater(new FormulaConversionTask(sender, newType), 1);
39+
mcMMO.p.getFoliaLib().getScheduler().runLater(new FormulaConversionTask(sender, newType), 1);
4040

4141
for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
42-
mcMMO.p.getFoliaLib().getImpl().runLaterAsync(new PlayerProfileLoadingTask(player), 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
42+
mcMMO.p.getFoliaLib().getScheduler().runLaterAsync(new PlayerProfileLoadingTask(player), 1); // 1 Tick delay to ensure the player is marked as online before we begin loading
4343
}
4444

4545
return true;

src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ protected static void handleTeleportWarmup(Player teleportingPlayer, Player targ
244244

245245
if (warmup > 0) {
246246
teleportingPlayer.sendMessage(LocaleLoader.getString("Teleport.Commencing", warmup));
247-
mcMMO.p.getFoliaLib().getImpl().runAtEntityLater(teleportingPlayer, new TeleportationWarmup(mcMMOPlayer, mcMMOTarget), 20 * warmup);
247+
mcMMO.p.getFoliaLib().getScheduler().runAtEntityLater(teleportingPlayer, new TeleportationWarmup(mcMMOPlayer, mcMMOTarget), 20 * warmup);
248248
} else {
249249
EventUtils.handlePartyTeleportEvent(teleportingPlayer, targetPlayer);
250250
}

src/main/java/com/gmail/nossr50/commands/player/McRankCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void display(CommandSender sender, String playerName) {
110110
boolean useBoard = mcMMO.p.getGeneralConfig().getScoreboardsEnabled() && (sender instanceof Player) && (mcMMO.p.getGeneralConfig().getRankUseBoard());
111111
boolean useChat = !useBoard || mcMMO.p.getGeneralConfig().getRankUseChat();
112112

113-
mcMMO.p.getFoliaLib().getImpl().runAsync(new McRankCommandAsyncTask(playerName, sender, useBoard, useChat));
113+
mcMMO.p.getFoliaLib().getScheduler().runAsync(new McRankCommandAsyncTask(playerName, sender, useBoard, useChat));
114114
}
115115

116116
private long getCDSeconds(McMMOPlayer mcMMOPlayer, long cooldownMillis) {

src/main/java/com/gmail/nossr50/commands/player/McTopCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ private void display(int page, PrimarySkillType skill, CommandSender sender) {
127127
boolean useBoard = (sender instanceof Player) && (mcMMO.p.getGeneralConfig().getTopUseBoard());
128128
boolean useChat = !useBoard || mcMMO.p.getGeneralConfig().getTopUseChat();
129129

130-
mcMMO.p.getFoliaLib().getImpl().runAsync(new McTopCommandAsyncTask(page, skill, sender, useBoard, useChat));
130+
mcMMO.p.getFoliaLib().getScheduler().runAsync(new McTopCommandAsyncTask(page, skill, sender, useBoard, useChat));
131131
}
132132

133133
private PrimarySkillType extractSkill(CommandSender sender, String skillName) {

src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ private void checkUpgradeAddUUIDs(final Statement statement) {
14721472
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "users` ADD `uuid` varchar(36) NULL DEFAULT NULL");
14731473
statement.executeUpdate("ALTER TABLE `" + tablePrefix + "users` ADD UNIQUE INDEX `uuid` (`uuid`) USING BTREE");
14741474

1475-
mcMMO.p.getFoliaLib().getImpl().runLaterAsync(new GetUUIDUpdatesRequired(), 100); // wait until after first purge
1475+
mcMMO.p.getFoliaLib().getScheduler().runLaterAsync(new GetUUIDUpdatesRequired(), 100); // wait until after first purge
14761476
}
14771477

14781478
mcMMO.getUpgradeManager().setUpgradeCompleted(UpgradeType.ADD_UUIDS);

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ public void checkAbilityActivation(PrimarySkillType primarySkillType) {
963963
}
964964

965965
setToolPreparationMode(tool, false);
966-
mcMMO.p.getFoliaLib().getImpl().runAtEntityLater(player, new AbilityDisableTask(this, superAbilityType), (long) ticks * Misc.TICK_CONVERSION_FACTOR);
966+
mcMMO.p.getFoliaLib().getScheduler().runAtEntityLater(player, new AbilityDisableTask(this, superAbilityType), (long) ticks * Misc.TICK_CONVERSION_FACTOR);
967967
}
968968

969969
public void processAbilityActivation(@NotNull PrimarySkillType primarySkillType) {
@@ -1021,7 +1021,7 @@ public void processAbilityActivation(@NotNull PrimarySkillType primarySkillType)
10211021
}
10221022

10231023
setToolPreparationMode(tool, true);
1024-
mcMMO.p.getFoliaLib().getImpl().runAtEntityLater(player, new ToolLowerTask(this, tool), 4 * Misc.TICK_CONVERSION_FACTOR);
1024+
mcMMO.p.getFoliaLib().getScheduler().runAtEntityLater(player, new ToolLowerTask(this, tool), 4 * Misc.TICK_CONVERSION_FACTOR);
10251025
}
10261026
}
10271027

src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,16 @@ public PlayerProfile(@NotNull String playerName, @Nullable UUID uuid,
108108
}
109109

110110
public void scheduleAsyncSave() {
111-
mcMMO.p.getFoliaLib().getImpl().runAsync(new PlayerProfileSaveTask(this, false));
111+
mcMMO.p.getFoliaLib().getScheduler().runAsync(new PlayerProfileSaveTask(this, false));
112112
}
113113

114114
public void scheduleAsyncSaveDelay() {
115-
mcMMO.p.getFoliaLib().getImpl().runLaterAsync(new PlayerProfileSaveTask(this, false), 20);
115+
mcMMO.p.getFoliaLib().getScheduler().runLaterAsync(new PlayerProfileSaveTask(this, false), 20);
116116
}
117117

118118
@Deprecated
119119
public void scheduleSyncSaveDelay() {
120-
mcMMO.p.getFoliaLib().getImpl().runLater(new PlayerProfileSaveTask(this, true), 20);
120+
mcMMO.p.getFoliaLib().getScheduler().runLater(new PlayerProfileSaveTask(this, true), 20);
121121
}
122122

123123
public void save(boolean useSync) {
@@ -143,7 +143,7 @@ public void save(boolean useSync) {
143143

144144
//Back out of async saving if we detect a server shutdown, this is not always going to be caught
145145
if (mcMMO.isServerShutdownExecuted() || useSync)
146-
mcMMO.p.getFoliaLib().getImpl().runNextTick(new PlayerProfileSaveTask(this, true));
146+
mcMMO.p.getFoliaLib().getScheduler().runNextTick(new PlayerProfileSaveTask(this, true));
147147
else
148148
scheduleAsyncSave();
149149

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void onBlockPistonExtend(BlockPistonExtendEvent event) {
135135
final BlockFace direction = event.getDirection();
136136

137137
for (final Block block : event.getBlocks()) {
138-
mcMMO.p.getFoliaLib().getImpl().runAtLocation(block.getLocation(), t -> {
138+
mcMMO.p.getFoliaLib().getScheduler().runAtLocation(block.getLocation(), t -> {
139139
final Block movedBlock = block.getRelative(direction);
140140

141141
if (BlockUtils.isWithinWorldBounds(movedBlock)) {

0 commit comments

Comments
 (0)