Plexus/Plex
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex.git synced 2025-07-14 01:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taah-cmd-blocker

Browse Source 
# Conflicts:
#	src/main/java/dev/plex/Plex.java
#	src/main/java/dev/plex/listener/impl/CommandListener.java
#	src/main/java/dev/plex/services/impl/CommandBlockerService.java
#	src/main/resources/commands.yml
This commit is contained in:
Taah
2022-04-10 00:04:06 -07:00
parent ec7d814467 8544775be2
commit 09bc47f3fb
49 changed files with 415 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/dev/plex/services/ServiceManager.java
View File

@ -43,7 +43,16 @@ public class ServiceManager
{
if (!service.isRepeating())
{
BukkitTask task = Bukkit.getScheduler().runTask(Plex.get(), service::run);
int time = service.repeatInSeconds();
BukkitTask task;
if (time == 0)
{
task = Bukkit.getScheduler().runTask(Plex.get(), service::run);
}
else
{
task = Bukkit.getScheduler().runTaskLater(Plex.get(), service::run, time);
}
service.setTaskId(task.getTaskId());
}
else if (service.isRepeating() && service.isAsynchronous())

1
src/main/java/dev/plex/services/impl/AutoWipeService.java
View File

@ -5,7 +5,6 @@ import dev.plex.services.AbstractService;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import java.util.List;