potion effect Async fix

RonanPlugins · Oct 7, 2023 · b4dae7d · b4dae7d
1 parent 044054d
commit b4dae7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/RTPTeleport.java
@@ -73,7 +73,8 @@ public void run() {
 
     //Effects
 
-    public void afterTeleport(Player p, Location loc, WorldPlayer wPlayer, int attempts, Location oldLoc, RTP_TYPE type) { //Only a successful rtp should run this OR '/rtp test'
+    public void afterTeleport(Player p, Location loc, WorldPlayer wPlayer, int attempts, Location oldLoc, RTP_TYPE type) {
+        //Only a successful rtp should run this OR '/rtp test'
         effects.getSounds().playTeleport(p);
         effects.getParticles().display(p);
         effects.getPotions().giveEffects(p);

diff --git a/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Potions.java b/src/main/java/me/SuperRonanCraft/BetterRTP/player/rtp/effects/RTPEffect_Potions.java
@@ -2,6 +2,8 @@
 
 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;
@@ -49,18 +51,20 @@ void load() {
     }
 
     public void giveEffects(Player p) {
-        if (invincibleEnabled)
-            p.setNoDamageTicks(invincibleTime * 20);
-        if (potionEnabled) {
-            List<PotionEffect> effects = new ArrayList<>();
-            for (PotionEffectType e : potionEffects.keySet()) {
-                Integer[] mods = potionEffects.get(e);
-                int duration = mods[0];
-                int amplifier = mods[1];
-                effects.add(new PotionEffect(e, duration, amplifier, false, false));
+        AsyncHandler.sync(() -> {
+            if (invincibleEnabled)
+                p.setNoDamageTicks(invincibleTime * 20);
+            if (potionEnabled) {
+                List<PotionEffect> effects = new ArrayList<>();
+                for (PotionEffectType e : potionEffects.keySet()) {
+                    Integer[] mods = potionEffects.get(e);
+                    int duration = mods[0];
+                    int amplifier = mods[1];
+                    effects.add(new PotionEffect(e, duration, amplifier, false, false));
+                }
+                p.addPotionEffects(effects);
             }
-            p.addPotionEffects(effects);
-        }
+        });
     }
 
 }