Skip to content

Commit d7416c5

Browse files
committed
Removed more BukkitRunnable (fixes errors in console).
1 parent 5c2c4b6 commit d7416c5

6 files changed

Lines changed: 13 additions & 24 deletions

File tree

src/main/java/ce/ajneb97/ConditionalEvents.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public void updateMessage(UpdateCheckerResult result){
248248
String latestVersion = result.getLatestVersion();
249249
if(latestVersion != null){
250250
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
251-
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/conditionalevents"));
251+
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &fhttps://github.com/ImZowi/ConditionalEvents-Folia"));
252252
}
253253
}else{
254254
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+" &cError while checking update."));

src/main/java/ce/ajneb97/libs/actionbar/ActionBarAPI.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import ce.ajneb97.utils.OtherUtils;
88
import org.bukkit.Bukkit;
99
import org.bukkit.entity.Player;
10-
import org.bukkit.scheduler.BukkitRunnable;
1110
import ce.ajneb97.ConditionalEvents;
1211
import net.md_5.bungee.api.ChatMessageType;
1312
import net.md_5.bungee.api.chat.TextComponent;

src/main/java/ce/ajneb97/libs/itemselectevent/ItemSelectListener.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.bukkit.event.player.PlayerItemHeldEvent;
1515
import org.bukkit.event.player.PlayerPickupItemEvent;
1616
import org.bukkit.inventory.ItemStack;
17-
import org.bukkit.scheduler.BukkitRunnable;
1817
import ce.ajneb97.ConditionalEvents;
18+
import ce.ajneb97.libs.FoliaAPI;
1919

2020
public class ItemSelectListener implements Listener{
2121

@@ -82,13 +82,8 @@ public void onCustomItemDrop(PlayerCustomDropEvent event) {
8282
ItemSelectEvent selectEvent = new ItemSelectEvent(player,item,action);
8383
Bukkit.getServer().getPluginManager().callEvent(selectEvent);
8484
}
85-
86-
new BukkitRunnable() {
87-
@Override
88-
public void run() {
89-
players.remove(player);
90-
}
91-
}.runTaskLater(plugin, 3L);
85+
86+
FoliaAPI.runTask(plugin, () -> { players.remove(player); }, 3L);
9287
}
9388

9489
@SuppressWarnings("deprecation")

src/main/java/ce/ajneb97/listeners/PlayerEventsListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void onJoin(PlayerJoinEvent event){
6565
if(player.isOp() && !(plugin.version.equals(latestVersion)) &&
6666
plugin.getConfigsManager().getMainConfigManager().isUpdateNotifications()){
6767
player.sendMessage(MessagesManager.getColoredMessage(plugin.prefix+" &cThere is a new version available. &e(&7"+latestVersion+"&e)"));
68-
player.sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/conditionalevents"));
68+
player.sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &ahttps://github.com/ImZowi/ServerVariables-Folia"));
6969
}
7070
}
7171

src/main/java/ce/ajneb97/managers/UpdateCheckerManager.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ public UpdateCheckerManager(String version){
1818

1919
public UpdateCheckerResult check(){
2020
try {
21-
HttpURLConnection con = (HttpURLConnection) new URL(
22-
"https://api.spigotmc.org/legacy/update.php?resource=82271").openConnection();
21+
HttpURLConnection con = (HttpURLConnection) new URL("https://api.spigotmc.org/legacy/update.php?resource=82271").openConnection();
2322
int timed_out = 1500;
2423
con.setConnectTimeout(timed_out);
2524
con.setReadTimeout(timed_out);

src/main/java/ce/ajneb97/model/internal/ExecutedEvent.java

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
import ce.ajneb97.model.actions.*;
1212
import ce.ajneb97.utils.ActionUtils;
1313
import ce.ajneb97.utils.VariablesUtils;
14+
import ce.ajneb97.libs.FoliaAPI;
1415
import org.bukkit.Bukkit;
1516
import org.bukkit.entity.Entity;
1617
import org.bukkit.entity.LivingEntity;
1718
import org.bukkit.entity.Player;
1819
import org.bukkit.event.Event;
19-
import org.bukkit.scheduler.BukkitRunnable;
2020

2121
import java.util.ArrayList;
2222
import java.util.List;
@@ -99,18 +99,10 @@ public void executeActions(){
9999
//Check cancel event or prevent join, always first to prevent issues with async events.
100100
executeCancelActions();
101101

102-
if(!Bukkit.isPrimaryThread()){
103-
new BukkitRunnable(){
104-
@Override
105-
public void run() {
106-
plugin.getServer().getPluginManager().callEvent(ceEvent);
107-
executeActionsFinal();
108-
}
109-
}.runTask(plugin);
110-
}else{
102+
FoliaAPI.runTask(plugin, () -> {
111103
plugin.getServer().getPluginManager().callEvent(ceEvent);
112104
executeActionsFinal();
113-
}
105+
});
114106
}
115107

116108
public void executeCancelActions(){
@@ -395,6 +387,8 @@ private void executeAction(LivingEntity livingEntity,ActionType type,String apiT
395387
// return;
396388
case TAB_COMPLETE:
397389
ActionUtils.tabComplete(actionLine,minecraftEvent);
390+
default:
391+
break;
398392
}
399393
}
400394

@@ -438,6 +432,8 @@ private void executeAction(LivingEntity livingEntity,ActionType type,String apiT
438432
// return;
439433
case TAB_COMPLETE:
440434
ActionUtils.tabComplete(actionLine,minecraftEvent);
435+
default:
436+
break;
441437
}
442438

443439
}

0 commit comments

Comments
 (0)