Update WorldGuardWrapper

This commit is contained in:
Esophose 2020-07-10 13:31:13 -06:00
parent 8e735914b3
commit 631db42937
3 changed files with 6 additions and 4 deletions

View file

@ -32,7 +32,7 @@ dependencies {
compile 'org.slf4j:slf4j-nop:1.7.25' compile 'org.slf4j:slf4j-nop:1.7.25'
compile 'com.zaxxer:HikariCP:3.2.0' compile 'com.zaxxer:HikariCP:3.2.0'
compile 'org.bstats:bstats-bukkit-lite:1.7' 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 'com.googlecode.json-simple:json-simple:1.1.1'
shadow 'org.jetbrains:annotations:16.0.2' shadow 'org.jetbrains:annotations:16.0.2'
shadow 'me.clip:placeholderapi:2.10.4' shadow 'me.clip:placeholderapi:2.10.4'

View file

@ -203,6 +203,8 @@ public class DataManager extends Manager {
World world = Bukkit.getWorld(result.getString("world")); World world = Bukkit.getWorld(result.getString("world"));
if (world == null) { if (world == null) {
// World was deleted, remove the fixed effect as it is no longer valid // World was deleted, remove the fixed effect as it is no longer valid
// 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); this.removeFixedEffect(playerUUID, fixedEffectId);
continue; continue;
} }

View file

@ -84,7 +84,7 @@ public class ParticleManager extends Manager implements Listener, Runnable {
if (WorldGuardHook.enabled()) { if (WorldGuardHook.enabled()) {
long worldGuardTicks = Setting.WORLDGUARD_CHECK_INTERVAL.getLong(); 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); }, 5);
@ -183,7 +183,7 @@ public class ParticleManager extends Manager implements Listener, Runnable {
/** /**
* Updates the WorldGuard region statuses for players * Updates the WorldGuard region statuses for players
*/ */
private void updateWorlGuardStatuses() { private void updateWorldGuardStatuses() {
PermissionManager permissionManager = this.playerParticles.getManager(PermissionManager.class); PermissionManager permissionManager = this.playerParticles.getManager(PermissionManager.class);
for (PPlayer pplayer : this.particlePlayers.values()) { for (PPlayer pplayer : this.particlePlayers.values()) {