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

修复在没有领地的时候报错null的问题
Java CI-CD with Maven / build (push) Successful in 17m31s Details

This commit is contained in:
zhangyuheng 2024-05-29 23:59:25 +08:00
parent da25215ad7
commit 033b103d35
3 changed files with 5 additions and 5 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>
<artifactId>Dominion</artifactId>
<version>1.30.4-beta</version>
<version>1.30.5-beta</version>
<packaging>jar</packaging>
<name>Dominion</name>

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

@ -218,9 +218,7 @@ public class Cache {
}
public DominionDTO getDominion(Location loc) {
List<DominionNode> tree = world_dominion_tree.get(loc.getWorld().getName());
if (tree == null) return null;
return getLocInDominionDTO(tree, loc);
return getLocInDominionDTO(world_dominion_tree.get(loc.getWorld().getName()), loc);
}
public List<DominionNode> getDominionTreeByPlayer(String player_name) {

4
src/main/java/cn/lunadeer/dominion/DominionNode.java
View File

@ -44,7 +44,9 @@ public class DominionNode {
return null;
}
public static DominionDTO getLocInDominionDTO(@NotNull List<DominionNode> nodes, @NotNull Location loc) {
public static DominionDTO getLocInDominionDTO(@Nullable List<DominionNode> nodes, @NotNull Location loc) {
if (nodes == null) return null;
if (nodes.isEmpty()) return null;
DominionNode dominionNode = getLocInDominionNode(nodes, loc);
return dominionNode == null ? null : dominionNode.dominion;
}