diff --git a/Plan/build.gradle b/Plan/build.gradle
index 8a08d1bf2..bc28c812a 100644
--- a/Plan/build.gradle
+++ b/Plan/build.gradle
@@ -59,11 +59,11 @@ subprojects {
ext.abstractPluginFrameworkVersion = "3.4.2"
ext.planPluginBridgeVersion = "4.9.0-R0.3"
- ext.bukkitVersion = "1.12.2-R0.1-SNAPSHOT"
- ext.spigotVersion = "1.12.2-R0.1-SNAPSHOT"
- ext.paperVersion = "1.12.2-R0.1-SNAPSHOT"
+ ext.bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
+ ext.spigotVersion = "1.13.2-R0.1-SNAPSHOT"
+ ext.paperVersion = "1.13.2-R0.1-SNAPSHOT"
ext.spongeVersion = "7.1.0"
- ext.bungeeVersion = "1.12-SNAPSHOT"
+ ext.bungeeVersion = "1.13-SNAPSHOT"
ext.velocityVersion = "1.0-SNAPSHOT"
ext.redisBungeeVersion = "0.3.8-SNAPSHOT"
diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
index e09fa21da..32654b7b6 100644
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
+++ b/Plan/bukkit/src/main/java/com/djrapitops/plan/Plan.java
@@ -18,7 +18,6 @@ package com.djrapitops.plan;
import com.djrapitops.plan.api.exceptions.EnableException;
import com.djrapitops.plan.command.PlanCommand;
-import com.djrapitops.plan.command.commands.RegisterCommandFilter;
import com.djrapitops.plan.system.PlanSystem;
import com.djrapitops.plan.system.locale.Locale;
import com.djrapitops.plan.system.locale.lang.PluginLang;
@@ -75,7 +74,6 @@ public class Plan extends BukkitPlugin implements PlanPlugin {
PlanCommand command = component.planCommand();
command.registerCommands();
registerCommand("plan", command);
- new RegisterCommandFilter().registerFilter();
if (system != null) {
system.getProcessing().submitNonCritical(() -> system.getListenerSystem().callEnableEvent(this));
}
diff --git a/Plan/bukkit/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java b/Plan/bukkit/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java
deleted file mode 100644
index 72c7a7b5a..000000000
--- a/Plan/bukkit/src/main/java/com/djrapitops/plan/command/commands/RegisterCommandFilter.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * This file is part of Player Analytics (Plan).
- *
- * Plan is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License v3 as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Plan is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Plan. If not, see .
- */
-package com.djrapitops.plan.command.commands;
-
-import com.google.common.collect.ImmutableSet;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
-import org.apache.logging.log4j.message.Message;
-
-import java.util.Set;
-
-/**
- * Filters out WebUser registration command logs.
- *
- * @author Rsl1122
- */
-public class RegisterCommandFilter extends AbstractFilter {
-
- private final Set censoredCommands = ImmutableSet.of("/plan web register", "/plan webuser register", "/plan register");
-
- public void registerFilter() {
- Logger logger = (Logger) LogManager.getRootLogger();
- logger.addFilter(this);
- }
-
- @Override
- public Result filter(LogEvent event) {
- if (event == null) {
- return Result.NEUTRAL;
- }
-
- return validateMessage(event.getMessage());
- }
-
- @Override
- public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) {
- return validateMessage(msg);
- }
-
- @Override
- public Result filter(Logger logger, Level level, Marker marker, String msg, Object... params) {
- return validateMessage(msg);
- }
-
- @Override
- public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) {
- if (msg == null) {
- return Result.NEUTRAL;
- }
-
- return validateMessage(msg.toString());
- }
-
- private Result validateMessage(Message message) {
- if (message == null) {
- return Result.NEUTRAL;
- }
-
- return validateMessage(message.getFormattedMessage());
- }
-
- private Result validateMessage(String message) {
- if (message == null) {
- return Result.NEUTRAL;
- }
-
- return commandShouldBeCensored(message)
- ? Result.DENY
- : Result.NEUTRAL;
- }
-
- private boolean commandShouldBeCensored(String message) {
- return message != null
- && (message.toLowerCase().contains("issued server command:")
- && shouldBeCensored(message));
- }
-
- private boolean shouldBeCensored(String message) {
- return message != null && censoredCommands.stream().anyMatch(message::contains);
- }
-}
diff --git a/Plan/common/src/main/resources/plugin.yml b/Plan/common/src/main/resources/plugin.yml
index 32ab6c8de..d74af22fb 100644
--- a/Plan/common/src/main/resources/plugin.yml
+++ b/Plan/common/src/main/resources/plugin.yml
@@ -2,6 +2,7 @@ name: Plan
author: Rsl1122
main: com.djrapitops.plan.Plan
version: 4.9.1
+api-version: 1.13
softdepend:
- ASkyBlock
- AdvancedAchievements