mirror of
https://github.com/RonanPlugins/BetterRTP.git
synced 2025-08-17 09:05:47 +00:00
multiverse fix + mysql.yml config option removed
This commit is contained in:
parent
d3bb025068
commit
fdfe7639ee
5
pom.xml
5
pom.xml
@ -7,7 +7,7 @@
|
||||
<groupId>me.SuperRonanCraft</groupId>
|
||||
<artifactId>BetterRTP</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
<version>3.2.0</version>
|
||||
<version>3.2.1-1</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>1.8</maven.compiler.source>
|
||||
@ -298,12 +298,13 @@
|
||||
<groupId>xyz.xenondevs</groupId>
|
||||
<artifactId>particle</artifactId>
|
||||
<version>1.5.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<version>RELEASE</version>
|
||||
<scope>compile</scope>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
@ -1,8 +1,8 @@
|
||||
package me.SuperRonanCraft.BetterRTP.references.database;
|
||||
|
||||
import lombok.NonNull;
|
||||
import me.RonanCraft.Pueblos.resources.files.FileOther;
|
||||
import me.SuperRonanCraft.BetterRTP.BetterRTP;
|
||||
import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.io.File;
|
||||
@ -81,22 +81,8 @@ public class SQLite {
|
||||
|
||||
public void load() {
|
||||
loaded = false;
|
||||
FileOther.FILETYPE sql = FileOther.FILETYPE.MYSQL;
|
||||
String pre = "MySQL.";
|
||||
sqlEnabled = sql.getBoolean(pre + "enabled");
|
||||
host = sql.getString(pre + "host");
|
||||
port = sql.getInt(pre + "port");
|
||||
database = sql.getString(pre + "database");
|
||||
username = sql.getString(pre + "username");
|
||||
password = sql.getString(pre + "password");
|
||||
if (!sqlEnabled) { //Update table names back to default if online database fails
|
||||
switch (type) {
|
||||
case COOLDOWN: table = "BetterRTP_Cooldown"; break;
|
||||
}
|
||||
} else {
|
||||
switch (type) {
|
||||
case COOLDOWN: table = sql.getString(pre + "tablePrefix") + "Cooldown"; break;
|
||||
}
|
||||
switch (type) {
|
||||
case COOLDOWN: table = "BetterRTP_Cooldown"; break;
|
||||
}
|
||||
if (table == null) {
|
||||
BetterRTP.getInstance().getLogger().severe("The table for `" + type.name() + "` is invalid. Disabling the plugin!");
|
||||
|
@ -2,6 +2,8 @@ main: me.SuperRonanCraft.BetterRTP.BetterRTP
|
||||
version: ${project.version}
|
||||
name: BetterRTP
|
||||
author: SuperRonanCraft
|
||||
loadbefore:
|
||||
- Multiverse-Core #Forcing Multiverse to load AFTER BetterRTP
|
||||
softdepend:
|
||||
- Vault
|
||||
- WorldGuard
|
||||
|
Loading…
x
Reference in New Issue
Block a user