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

Fixed some sponge issues

Browse Source
This commit is contained in:
Rsl1122 2018-04-13 10:30:57 +03:00
parent f1024f67c0
commit 3c81926ef8
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Plan/dependency-reduced-pom.xml
View File

@ -62,6 +62,15 @@
<exclude>junit:*</exclude> <exclude>junit:*</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>
<relocations>
<relocation>
<pattern>org.apache</pattern>
<shadedPattern>plan.org.apache</shadedPattern>
<excludes>
<exclude>org.apache.logging.*</exclude>
</excludes>
</relocation>
</relocations>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
@ -260,7 +269,7 @@
<dependency> <dependency>
<groupId>org.spongepowered</groupId> <groupId>org.spongepowered</groupId>
<artifactId>spongeapi</artifactId> <artifactId>spongeapi</artifactId>
<version>7.0.0</version> <version>LATEST</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

5
Plan/pom.xml
View File

@ -70,7 +70,7 @@
<dependency> <dependency>
<groupId>org.spongepowered</groupId> <groupId>org.spongepowered</groupId>
<artifactId>spongeapi</artifactId> <artifactId>spongeapi</artifactId>
<version>7.0.0</version> <version>LATEST</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
@ -195,6 +195,9 @@
<relocation> <relocation>
<pattern>org.apache</pattern> <pattern>org.apache</pattern>
<shadedPattern>plan.org.apache</shadedPattern> <shadedPattern>plan.org.apache</shadedPattern>
<excludes>
<exclude>org.apache.logging.*</exclude>
</excludes>
</relocation> </relocation>
</relocations> </relocations>
</configuration> </configuration>

4
Plan/src/main/java/com/djrapitops/plan/command/commands/manage/ManageConDebugCommand.java
View File

@ -50,6 +50,10 @@ public class ManageConDebugCommand extends CommandNode {
try { try {
List<Server> servers = Database.getActive().fetch().getServers(); List<Server> servers = Database.getActive().fetch().getServers();
if (servers.isEmpty()) {
sender.sendMessage("§cNo Servers found in the database.");
}
String accessAddress = WebServerSystem.getInstance().getWebServer().getAccessAddress(); String accessAddress = WebServerSystem.getInstance().getWebServer().getAccessAddress();
UUID thisServer = ServerInfo.getServerUUID(); UUID thisServer = ServerInfo.getServerUUID();
for (Server server : servers) { for (Server server : servers) {

3
Plan/src/main/java/com/djrapitops/plan/system/database/DBSystem.java
View File

@ -50,7 +50,8 @@ public abstract class DBSystem implements SubSystem {
Benchmark.stop("Enable", "Init Database"); Benchmark.stop("Enable", "Init Database");
} catch (DBInitException e) { } catch (DBInitException e) {
Throwable cause = e.getCause(); Throwable cause = e.getCause();
throw new EnableException(db.getName() + " init failure: " + cause.getMessage(), cause); String message = cause == null ? e.getMessage() : cause.getMessage();
throw new EnableException((db != null ? db.getName() : "Database") + " init failure: " + message, cause);
} }
} }

4
Plan/src/main/java/com/djrapitops/plan/system/info/request/SaveDBSettingsRequest.java
View File

@ -4,7 +4,7 @@
*/ */
package com.djrapitops.plan.system.info.request; package com.djrapitops.plan.system.info.request;
import com.djrapitops.plan.Plan; import com.djrapitops.plan.PlanPlugin;
import com.djrapitops.plan.api.exceptions.connection.BadRequestException; import com.djrapitops.plan.api.exceptions.connection.BadRequestException;
import com.djrapitops.plan.api.exceptions.connection.WebException; import com.djrapitops.plan.api.exceptions.connection.WebException;
import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.Settings;
@ -64,7 +64,7 @@ public class SaveDBSettingsRequest extends InfoRequestWithVariables implements S
Log.info("----------------------------------"); Log.info("----------------------------------");
return DefaultResponses.SUCCESS.get(); return DefaultResponses.SUCCESS.get();
} finally { } finally {
Plan.getInstance().reloadPlugin(true); PlanPlugin.getInstance().reloadPlugin(true);
} }
} }