zhangyuheng/Dominion
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 144 Wiki Activity

为缓存增加了线程安全保护
Some checks failed
Java CI-CD with Maven / build (push) Failing after 31m42s
Details

Browse Source
This commit is contained in:
zhangyuheng 2024-02-23 15:43:52 +08:00
parent be6242463c
commit 914c05f484
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>cn.lunadeer</groupId> <groupId>cn.lunadeer</groupId>
<artifactId>Dominion</artifactId> <artifactId>Dominion</artifactId>
<version>1.9.2-beta</version> <version>1.9.3-beta</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Dominion</name> <name>Dominion</name>

23
src/main/java/cn/lunadeer/dominion/Cache.java
View File

@ -9,11 +9,12 @@ import org.bukkit.entity.Player;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
public class Cache { public class Cache {
public Cache() { public Cache() {
player_current_dominion = new HashMap<>(); player_current_dominion = new ConcurrentHashMap<>();
loadDominions(); loadDominions();
loadPlayerPrivileges(); loadPlayerPrivileges();
} }
@ -22,9 +23,9 @@ public class Cache {
* 从数据库加载所有领地 * 从数据库加载所有领地
*/ */
public void loadDominions() { public void loadDominions() {
id_dominions = new HashMap<>(); id_dominions = new ConcurrentHashMap<>();
world_dominions = new HashMap<>(); world_dominions = new ConcurrentHashMap<>();
dominion_children = new HashMap<>(); dominion_children = new ConcurrentHashMap<>();
List<DominionDTO> dominions = DominionDTO.selectAll(); List<DominionDTO> dominions = DominionDTO.selectAll();
for (DominionDTO d : dominions) { for (DominionDTO d : dominions) {
if (!dominion_children.containsKey(d.getId())) { if (!dominion_children.containsKey(d.getId())) {
@ -54,11 +55,11 @@ public class Cache {
XLogger.err("加载玩家特权失败"); XLogger.err("加载玩家特权失败");
return; return;
} }
player_uuid_to_privilege = new HashMap<>(); player_uuid_to_privilege = new ConcurrentHashMap<>();
for (PlayerPrivilegeDTO privilege : all_privileges) { for (PlayerPrivilegeDTO privilege : all_privileges) {
UUID player_uuid = privilege.getPlayerUUID(); UUID player_uuid = privilege.getPlayerUUID();
if (!player_uuid_to_privilege.containsKey(player_uuid)) { if (!player_uuid_to_privilege.containsKey(player_uuid)) {
player_uuid_to_privilege.put(player_uuid, new HashMap<>()); player_uuid_to_privilege.put(player_uuid, new ConcurrentHashMap<>());
} }
player_uuid_to_privilege.get(player_uuid).put(privilege.getDomID(), privilege); player_uuid_to_privilege.get(player_uuid).put(privilege.getDomID(), privilege);
} }
@ -197,9 +198,9 @@ public class Cache {
} }
public static Cache instance; public static Cache instance;
private Map<Integer, DominionDTO> id_dominions; private ConcurrentHashMap<Integer, DominionDTO> id_dominions;
private Map<String, List<Integer>> world_dominions; // 所有领地 private ConcurrentHashMap<String, List<Integer>> world_dominions; // 所有领地
private Map<UUID, Map<Integer, PlayerPrivilegeDTO>> player_uuid_to_privilege; // 玩家所有的特权 private ConcurrentHashMap<UUID, ConcurrentHashMap<Integer, PlayerPrivilegeDTO>> player_uuid_to_privilege; // 玩家所有的特权
private Map<UUID, Integer> player_current_dominion; // 玩家当前所在领地 private ConcurrentHashMap<UUID, Integer> player_current_dominion; // 玩家当前所在领地
private Map<Integer, List<Integer>> dominion_children; private ConcurrentHashMap<Integer, List<Integer>> dominion_children;
} }