Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2024-11-30 14:03:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.com:Songoda/songodaupdater into development

Browse Source
This commit is contained in:
jascotty2 2019-09-28 17:17:24 -05:00
commit e9312c64af
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -4,7 +4,7 @@ stages:
variables: variables:
name: "SongodaCore" name: "SongodaCore"
path: "/builds/$CI_PROJECT_PATH" path: "/builds/$CI_PROJECT_PATH"
version: "2.1.7" version: "2.1.8"
build: build:
stage: build stage: build

9
Core/src/main/java/com/songoda/core/SongodaCore.java
View File

@ -15,12 +15,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.HttpURLConnection; import java.net.HttpURLConnection;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.logging.Level; import java.util.logging.Level;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -177,7 +172,7 @@ public class SongodaCore {
*/ */
private void destroy() { private void destroy() {
Bukkit.getServicesManager().unregister(SongodaCore.class, INSTANCE); Bukkit.getServicesManager().unregister(SongodaCore.class, INSTANCE);
tasks.stream().filter(task -> task != null && !task.isCancelled()) tasks.stream().filter(Objects::nonNull)
.forEach(task -> Bukkit.getScheduler().cancelTask(task.getTaskId())); .forEach(task -> Bukkit.getScheduler().cancelTask(task.getTaskId()));
HandlerList.unregisterAll(loginListener); HandlerList.unregisterAll(loginListener);
if (!hasShading()) { if (!hasShading()) {