YouHaveTrouble/PreventStabby
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/PreventStabby.git synced 2026-05-12 13:26:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

use object for PlayerData instead of hashmap

Browse Source
This commit is contained in:
YouHaveTrouble
2021-02-19 02:54:51 +01:00
parent b9a4286a64
commit 905861079f
21 changed files with 107 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/togglepvp/util/CombatTimer.java
+2 -2
View File
@@ -11,7 +11,7 @@ public class CombatTimer {
public static void refreshPlayersCombatTime(UUID uuid) {
try {
long now = Instant.now().getEpochSecond();
long combattime = (long) SmartCache.getPlayerData(uuid).get("combattime");
long combattime = SmartCache.getPlayerData(uuid).getCombattime();
if (combattime < now) {
PluginMessages.sendActionBar(uuid, TogglePvP.getPlugin().getConfigCache().getEntering_combat());
}
@@ -26,7 +26,7 @@ public class CombatTimer {
public static boolean isInCombat(UUID uuid) {
try {
long combattimer = (long) SmartCache.getPlayerData(uuid).get("combattime");
long combattimer = SmartCache.getPlayerData(uuid).getCombattime();
long now = Instant.now().getEpochSecond();
return combattimer > now;
} catch (Exception e) {
src/main/java/eu/endermite/togglepvp/util/DatabaseSQLite.java
+7 -10
View File
@@ -1,6 +1,7 @@
package eu.endermite.togglepvp.util;
import eu.endermite.togglepvp.TogglePvP;
import eu.endermite.togglepvp.players.PlayerData;
import java.io.File;
import java.sql.*;
@@ -9,8 +10,8 @@ import java.util.UUID;
public class DatabaseSQLite {
private String url;
private File folder;
private final String url;
private final File folder;
public DatabaseSQLite(String url, File folder) {
this.url = url;
@@ -48,7 +49,6 @@ public class DatabaseSQLite {
if (conn != null) {
conn.close();
}
return true;
} catch (SQLException ex) {
System.out.println(ex.getMessage());
}
@@ -56,8 +56,7 @@ public class DatabaseSQLite {
return false;
}
public HashMap<String, Object> getPlayerInfo(UUID uuid) {
HashMap<String, Object> dataHashMap = new HashMap<>();
public PlayerData getPlayerInfo(UUID uuid) {
try {
Connection conn = DriverManager.getConnection(url);
@@ -74,23 +73,21 @@ public class DatabaseSQLite {
String sql = "SELECT * FROM `players` WHERE `player_uuid` = '" + uuid.toString() + "';";
statement.execute(sql);
ResultSet result = statement.getResultSet();
dataHashMap.put("pvpenabled", result.getBoolean("pvpenabled"));
conn.close();
return dataHashMap;
return new PlayerData(result.getBoolean("pvpenabled"));
} catch (SQLException throwables) {
throwables.printStackTrace();
}
return null;
}
public void updatePlayerInfo(UUID uuid, HashMap<String, Object> data) {
public void updatePlayerInfo(UUID uuid, PlayerData data) {
try {
Connection conn = DriverManager.getConnection(url);
Statement insertnewuser = conn.createStatement();
try {
String newuserdata = "UPDATE `players` SET pvpenabled = "+data.get("pvpenabled")+" WHERE `player_uuid` = '"+uuid.toString()+"';";
String newuserdata = "UPDATE `players` SET pvpenabled = "+data.isPvpEnabled()+" WHERE `player_uuid` = '"+uuid.toString()+"';";
insertnewuser.execute(newuserdata);
} catch (SQLException e) {
TogglePvP.getPlugin().getLogger().severe("Error while saving player data!");