Skip to content

Commit 11488ed

Browse files
committed
Fixed issue with mysql database
1 parent 0eb4b79 commit 11488ed

5 files changed

Lines changed: 33 additions & 31 deletions

File tree

Plugin/src/main/java/dev/lrxh/neptune/database/DataDocument.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public DataDocument(String jsonString) {
4141
}
4242
} catch (JsonParseException e) {
4343
ServerUtils.error("Invalid JSON string: " + jsonString);
44-
throw e;
44+
throw e;
4545
}
4646
}
4747

Plugin/src/main/java/dev/lrxh/neptune/database/IDatabase.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@
66
import java.util.UUID;
77

88
public interface IDatabase {
9+
String uri = SettingsLocale.URI.getString();
10+
String database = SettingsLocale.DATABASE.getString();
11+
912
IDatabase load();
13+
1014
DataDocument getUserData(UUID playerUUID);
15+
1116
void replace(UUID playerUUID, DataDocument newDocument);
17+
1218
void replace(String playerUUID, DataDocument newDocument);
19+
1320
List<DataDocument> getAll();
14-
String uri = SettingsLocale.URI.getString();
15-
String database = SettingsLocale.DATABASE.getString();
1621
}

Plugin/src/main/java/dev/lrxh/neptune/database/impl/MongoDatabase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@
1010
import dev.lrxh.neptune.database.DataDocument;
1111
import dev.lrxh.neptune.database.IDatabase;
1212
import dev.lrxh.neptune.utils.ServerUtils;
13-
import lombok.Getter;
1413
import org.bson.Document;
1514
import org.bukkit.Bukkit;
1615

1716
import java.util.ArrayList;
1817
import java.util.List;
1918
import java.util.UUID;
2019

21-
@Getter
2220
public class MongoDatabase implements IDatabase {
2321
private final Neptune plugin;
2422
public MongoCollection<Document> collection;

Plugin/src/main/java/dev/lrxh/neptune/database/impl/MySQLDatabase.java

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import dev.lrxh.neptune.database.DataDocument;
66
import dev.lrxh.neptune.database.IDatabase;
77
import dev.lrxh.neptune.utils.ServerUtils;
8-
import lombok.Getter;
98
import org.bson.Document;
109
import org.bukkit.Bukkit;
1110

@@ -14,7 +13,6 @@
1413
import java.util.List;
1514
import java.util.UUID;
1615

17-
@Getter
1816
public class MySQLDatabase implements IDatabase {
1917
private final Neptune plugin;
2018
private Connection connection;
@@ -35,19 +33,7 @@ public IDatabase load() {
3533
return this;
3634
}
3735

38-
private void createTableIfNotExists() {
39-
String createTableQuery = "CREATE TABLE IF NOT EXISTS playerData (" +
40-
"uuid VARCHAR(36) NOT NULL, " +
41-
"data TEXT NOT NULL, " +
42-
"PRIMARY KEY (uuid)" +
43-
")";
44-
try (Statement statement = connection.createStatement()) {
45-
statement.execute(createTableQuery);
46-
} catch (SQLException e) {
47-
ServerUtils.error("Error creating playerData table: " + e.getMessage());
48-
}
49-
}
50-
36+
@Override
5137
public DataDocument getUserData(UUID playerUUID) {
5238
String query = "SELECT * FROM playerData WHERE uuid=?";
5339
try (PreparedStatement statement = connection.prepareStatement(query)) {
@@ -67,15 +53,6 @@ public DataDocument getUserData(UUID playerUUID) {
6753
return null;
6854
}
6955

70-
public boolean isValidJSON(String jsonString) {
71-
try {
72-
Document.parse(jsonString);
73-
return true;
74-
} catch (JsonParseException e) {
75-
return false;
76-
}
77-
}
78-
7956
@Override
8057
public void replace(UUID playerUUID, DataDocument newDocument) {
8158
String updateQuery = "REPLACE INTO playerData (uuid, data) VALUES (?, ?)";
@@ -119,4 +96,26 @@ public List<DataDocument> getAll() {
11996
}
12097
return allDocuments;
12198
}
99+
100+
public boolean isValidJSON(String jsonString) {
101+
try {
102+
Document.parse(jsonString);
103+
return true;
104+
} catch (JsonParseException e) {
105+
return false;
106+
}
107+
}
108+
109+
private void createTableIfNotExists() {
110+
String createTableQuery = "CREATE TABLE IF NOT EXISTS playerData (" +
111+
"uuid VARCHAR(36) NOT NULL, " +
112+
"data TEXT NOT NULL, " +
113+
"PRIMARY KEY (uuid)" +
114+
")";
115+
try (Statement statement = connection.createStatement()) {
116+
statement.execute(createTableQuery);
117+
} catch (SQLException e) {
118+
ServerUtils.error("Error creating playerData table: " + e.getMessage());
119+
}
120+
}
122121
}

Plugin/src/main/java/dev/lrxh/neptune/match/Match.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@ public void checkRules() {
213213
}
214214
}
215215

216-
if(!kit.isSaturation()){
216+
if (!kit.isSaturation()) {
217217
Player player = Bukkit.getPlayer(participant.getPlayerUUID());
218-
if(player == null) return;
218+
if (player == null) return;
219219
player.setSaturation(0.0F);
220220
}
221221
});

0 commit comments

Comments
 (0)