Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-12 21:54:02 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.7.0' into master

Browse Source
This commit is contained in:
Rsl1122 2017-08-07 22:38:28 +03:00 committed by GitHub
commit 36e4a09661
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/Permissions.java
View File

@ -43,9 +43,7 @@ public enum Permissions {
} }
/** /**
* Returns the permission node in plugin.yml. * Same as {@link #getPermission()}.
* <p>
* Same as getPermission.
* *
* @return permission node eg. plan.inspect * @return permission node eg. plan.inspect
*/ */

7
Plan/src/main/java/com/djrapitops/plan/Plan.java
View File

@ -72,7 +72,7 @@ public class Plan extends BukkitPlugin<Plan> {
private HookHandler hookHandler; // Manages 3rd party data sources private HookHandler hookHandler; // Manages 3rd party data sources
private Database db; private Database db;
private HashSet<Database> databases; private Set<Database> databases;
private WebServer uiServer; private WebServer uiServer;
@ -85,8 +85,9 @@ public class Plan extends BukkitPlugin<Plan> {
* @return API of the current instance of Plan. * @return API of the current instance of Plan.
* @throws IllegalStateException If onEnable method has not been called on * @throws IllegalStateException If onEnable method has not been called on
* Plan and the instance is null. * Plan and the instance is null.
* @throws NoClassDefFoundError If Plan is not installed.
*/ */
public static API getPlanAPI() throws IllegalStateException { public static API getPlanAPI() throws IllegalStateException, NoClassDefFoundError {
Plan instance = getInstance(); Plan instance = getInstance();
if (instance == null) { if (instance == null) {
throw new IllegalStateException("Plugin not enabled properly, Singleton instance is null."); throw new IllegalStateException("Plugin not enabled properly, Singleton instance is null.");
@ -110,7 +111,7 @@ public class Plan extends BukkitPlugin<Plan> {
*/ */
@Override @Override
public void onEnable() { public void onEnable() {
// Sets the Required variables for RslPlugin instance to function correctly // Sets the Required variables for BukkitPlugin instance to function correctly
setInstance(this); setInstance(this);
super.setDebugMode(Settings.DEBUG.toString()); super.setDebugMode(Settings.DEBUG.toString());
super.setColorScheme(new ColorScheme(Phrase.COLOR_MAIN.color(), Phrase.COLOR_SEC.color(), Phrase.COLOR_TER.color())); super.setColorScheme(new ColorScheme(Phrase.COLOR_MAIN.color(), Phrase.COLOR_SEC.color(), Phrase.COLOR_TER.color()));

2
Plan/src/main/java/com/djrapitops/plan/database/DBUtils.java
View File

@ -19,7 +19,7 @@ import java.util.Map.Entry;
*/ */
public class DBUtils { public class DBUtils {
private static final int BATCH_SIZE = 2048; private static final int BATCH_SIZE = 10192;
/** /**
* Constructor used to hide the public constructor * Constructor used to hide the public constructor