diff --git a/build.gradle b/build.gradle index 701d5da..722a6fe 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ dependencies { compile 'org.slf4j:slf4j-nop:1.7.25' compile 'com.zaxxer:HikariCP:3.2.0' compile 'org.bstats:bstats-bukkit-lite:1.7' - compile 'org.codemc.worldguardwrapper:worldguardwrapper:1.1.6-SNAPSHOT' + compile 'org.codemc.worldguardwrapper:worldguardwrapper:1.1.9-SNAPSHOT' shadow 'com.googlecode.json-simple:json-simple:1.1.1' shadow 'org.jetbrains:annotations:16.0.2' shadow 'me.clip:placeholderapi:2.10.4' diff --git a/src/main/java/dev/esophose/playerparticles/manager/DataManager.java b/src/main/java/dev/esophose/playerparticles/manager/DataManager.java index 532127d..d957417 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/DataManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/DataManager.java @@ -203,7 +203,9 @@ public class DataManager extends Manager { World world = Bukkit.getWorld(result.getString("world")); if (world == null) { // World was deleted, remove the fixed effect as it is no longer valid - this.removeFixedEffect(playerUUID, fixedEffectId); + // Only delete on SQLite, as a MySQL server may have fixed effects from other servers saved + if (this.databaseConnector instanceof SQLiteConnector) + this.removeFixedEffect(playerUUID, fixedEffectId); continue; } diff --git a/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java b/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java index 61e2fdb..2c98b84 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/ParticleManager.java @@ -84,7 +84,7 @@ public class ParticleManager extends Manager implements Listener, Runnable { if (WorldGuardHook.enabled()) { long worldGuardTicks = Setting.WORLDGUARD_CHECK_INTERVAL.getLong(); - this.worldGuardTask = Bukkit.getScheduler().runTaskTimer(this.playerParticles, this::updateWorlGuardStatuses, 0, worldGuardTicks); + this.worldGuardTask = Bukkit.getScheduler().runTaskTimer(this.playerParticles, this::updateWorldGuardStatuses, 0, worldGuardTicks); } }, 5); @@ -183,7 +183,7 @@ public class ParticleManager extends Manager implements Listener, Runnable { /** * Updates the WorldGuard region statuses for players */ - private void updateWorlGuardStatuses() { + private void updateWorldGuardStatuses() { PermissionManager permissionManager = this.playerParticles.getManager(PermissionManager.class); for (PPlayer pplayer : this.particlePlayers.values()) {