From 0c625a1ff4adfe5dd75dbad3d0e766c4e112cea6 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 18 May 2016 14:16:21 +0200 Subject: [PATCH] This is 2.8.14 --- plugin.yml | 2 +- .../massivecore/predicate/PredicateElementGarbage.java | 2 ++ src/com/massivecraft/massivecore/util/BoardUtil.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/plugin.yml b/plugin.yml index 1e466492..655b8579 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,6 +1,6 @@ main: com.massivecraft.massivecore.MassiveCore name: MassiveCore -version: 2.8.13 +version: 2.8.14 website: https://www.massivecraft.com/massivecore authors: [Cayorion] description: §eMassiveCore is a plugin that contains libraries and features that other plugins make use of. §aCayorion §efrom the minecraft server §aMassiveCraft §eis the lead programmer. Feel free to visit us at §bhttps://www.massivecraft.com diff --git a/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java b/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java index f7806885..336bee28 100644 --- a/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java +++ b/src/com/massivecraft/massivecore/predicate/PredicateElementGarbage.java @@ -14,12 +14,14 @@ public class PredicateElementGarbage extends PredicateElementRegexes { super( "^" + Pattern.quote("com.massivecraft.massivelag.inject") + ".*$", // MassiveLag - Injected stuff for commands, tasks and events. + // TODO: Missing PerWorldPlugins equivalents? "^" + Pattern.quote("com.massivecraft.massivecore.command.MassiveCoreBukkitCommand.execute") + ".*$", // MassiveCommand - Execution Garbage "^" + Pattern.quote("com.massivecraft.massivecore.command.MassiveCommand.execute") + ".*$", // MassiveCommand - Execution Garbage "^" + Pattern.quote("com.sk89q.bukkit.util.DynamicPluginCommand.execute") + ".*$", // SK89Q "^" + Pattern.quote("com.sk89q.worldguard.bukkit.WorldGuardPlugin.onCommand") + ".*$", // SK89Q + // TODO: Missing WorldEdit equivalents "^" + Pattern.quote("com.sk89q.minecraft.util.commands.CommandsManager") + ".*$", // SK89Q "^" + Pattern.quote("sun.reflect") + ".*$", // Event Reflection diff --git a/src/com/massivecraft/massivecore/util/BoardUtil.java b/src/com/massivecraft/massivecore/util/BoardUtil.java index 4886846c..5a76e9ab 100644 --- a/src/com/massivecraft/massivecore/util/BoardUtil.java +++ b/src/com/massivecraft/massivecore/util/BoardUtil.java @@ -72,11 +72,11 @@ public class BoardUtil extends Engine // -------------------------------------------- // // All online players at the beginning of the tick. - private static Map players; + private static Map players = Collections.emptyMap(); public static Map getPlayers() { return players; } // The boards based off the players above. - private static Set boards; + private static Set boards = Collections.emptySet(); public static Set getBoards() { return boards; } // Ensure things, possibly strictly.