multiverse fix + mysql.yml config option removed

This commit is contained in:
RonanCraft 2021-09-28 09:57:57 -04:00
parent d3bb025068
commit fdfe7639ee
3 changed files with 8 additions and 19 deletions

View File

@ -7,7 +7,7 @@
<groupId>me.SuperRonanCraft</groupId> <groupId>me.SuperRonanCraft</groupId>
<artifactId>BetterRTP</artifactId> <artifactId>BetterRTP</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.2.0</version> <version>3.2.1-1</version>
<properties> <properties>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
@ -298,12 +298,13 @@
<groupId>xyz.xenondevs</groupId> <groupId>xyz.xenondevs</groupId>
<artifactId>particle</artifactId> <artifactId>particle</artifactId>
<version>1.5.1</version> <version>1.5.1</version>
<scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>RELEASE</version> <version>RELEASE</version>
<scope>compile</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -1,8 +1,8 @@
package me.SuperRonanCraft.BetterRTP.references.database; package me.SuperRonanCraft.BetterRTP.references.database;
import lombok.NonNull; import lombok.NonNull;
import me.RonanCraft.Pueblos.resources.files.FileOther;
import me.SuperRonanCraft.BetterRTP.BetterRTP; import me.SuperRonanCraft.BetterRTP.BetterRTP;
import me.SuperRonanCraft.BetterRTP.references.file.FileBasics;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import java.io.File; import java.io.File;
@ -81,22 +81,8 @@ public class SQLite {
public void load() { public void load() {
loaded = false; loaded = false;
FileOther.FILETYPE sql = FileOther.FILETYPE.MYSQL; switch (type) {
String pre = "MySQL."; case COOLDOWN: table = "BetterRTP_Cooldown"; break;
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;
}
} }
if (table == null) { if (table == null) {
BetterRTP.getInstance().getLogger().severe("The table for `" + type.name() + "` is invalid. Disabling the plugin!"); BetterRTP.getInstance().getLogger().severe("The table for `" + type.name() + "` is invalid. Disabling the plugin!");

View File

@ -2,6 +2,8 @@ main: me.SuperRonanCraft.BetterRTP.BetterRTP
version: ${project.version} version: ${project.version}
name: BetterRTP name: BetterRTP
author: SuperRonanCraft author: SuperRonanCraft
loadbefore:
- Multiverse-Core #Forcing Multiverse to load AFTER BetterRTP
softdepend: softdepend:
- Vault - Vault
- WorldGuard - WorldGuard