mirrors/BetterRTP
1
0
Fork 0
mirror of https://github.com/RonanPlugins/BetterRTP.git synced 2025-07-01 15:26:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix folia potion effects on players (#197)

Browse Source 
* Update FoliaLib to 0.3.1

* Fix potion effects such that they are applied using the entity's scheduler

* Update FoliaLib usages in code for v0.3.1
This commit is contained in:
TechnicallyCoded 2024-02-05 00:03:39 +01:00 committed by GitHub
parent 57b4c0078c
commit dbde32d48d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -345,7 +345,7 @@
<dependency>
<groupId>com.tcoded</groupId>
<artifactId>FoliaLib</artifactId>
<version>0.2.3-legacy-support</version>
<version>0.3.1</version>
<scope>compile</scope>
</dependency>
<!-- FactionsBridge -->

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/events/WorldLoad.java
View File

@ -1,10 +1,9 @@
package me.SuperRonanCraft.BetterRTP.player.events;
import com.tcoded.folialib.wrapper.WrappedTask;
import com.tcoded.folialib.wrapper.task.WrappedTask;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.scheduler.BukkitTask;
public class WorldLoad {

2
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPDelay.java
View File

@ -1,6 +1,6 @@
package me.SuperRonanCraft.BetterRTP.player.rtp;
import com.tcoded.folialib.wrapper.WrappedTask;
import com.tcoded.folialib.wrapper.task.WrappedTask;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.customEvents.RTP_CancelledEvent;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;

3
src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Potions.java
View File

@ -3,7 +3,6 @@ package me.SuperRonanCraft.BetterRTP.player.rtp.effects;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.file.FileOther;
import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import me.SuperRonanCraft.BetterRTP.versions.FoliaHandler;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
@ -51,7 +50,7 @@ public class RTPEffect_Potions { //Potions AND Invincibility
}
public void giveEffects(Player p) {
AsyncHandler.sync(() -> {
AsyncHandler.syncAtEntity(p, () -> {
if (invincibleEnabled)
p.setNoDamageTicks(invincibleTime * 20);
if (potionEnabled) {

3
src/main/java/me/SuperRonanCraft/BetterRTP/references/rtpinfo/QueueGenerator.java
View File

@ -1,6 +1,6 @@
package me.SuperRonanCraft.BetterRTP.references.rtpinfo;
import com.tcoded.folialib.wrapper.WrappedTask;
import com.tcoded.folialib.wrapper.task.WrappedTask;
import io.papermc.lib.PaperLib;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.player.commands.RTP_SETUP_TYPE;
@ -13,7 +13,6 @@ import me.SuperRonanCraft.BetterRTP.versions.AsyncHandler;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.scheduler.BukkitTask;
import org.jetbrains.annotations.Nullable;
import java.util.HashMap;

18
src/main/java/me/SuperRonanCraft/BetterRTP/versions/AsyncHandler.java
View File

@ -1,29 +1,33 @@
package me.SuperRonanCraft.BetterRTP.versions;
import com.tcoded.folialib.impl.ServerImplementation;
import com.tcoded.folialib.wrapper.WrappedTask;
import com.tcoded.folialib.wrapper.task.WrappedTask;
import me.SuperRonanCraft.BetterRTP.BetterRTP;
import java.util.concurrent.TimeUnit;
import org.bukkit.entity.Entity;
public class AsyncHandler {
public static void async(Runnable runnable) {
getFolia().runAsync(runnable);
getFolia().runAsync(task -> runnable.run());
//Bukkit.getScheduler().runTaskAsynchronously(BetterRTP.getInstance(), runnable);
}
public static void sync(Runnable runnable) {
getFolia().runNextTick(runnable);
getFolia().runNextTick(task -> runnable.run());
//Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable);
}
public static void syncAtEntity(Entity entity, Runnable runnable) {
getFolia().runAtEntity(entity, task -> runnable.run());
//Bukkit.getScheduler().runTask(BetterRTP.getInstance(), runnable);
}
public static WrappedTask asyncLater(Runnable runnable, long ticks) {
return getFolia().runLaterAsync(runnable, ticks * 50, TimeUnit.MILLISECONDS);
return getFolia().runLaterAsync(runnable, ticks);
//return Bukkit.getScheduler().runTaskLaterAsynchronously(BetterRTP.getInstance(), runnable, ticks);
}
public static WrappedTask syncLater(Runnable runnable, long ticks) {
return getFolia().runLater(runnable, ticks * 50, TimeUnit.MILLISECONDS);
return getFolia().runLater(runnable, ticks);
//return Bukkit.getScheduler().runTaskLater(BetterRTP.getInstance(), runnable, ticks);
}