mirror of
https://github.com/ColdeZhang/Dominion.git
synced 2024-10-19 05:26:41 +08:00
修复在没有领地的时候报错null的问题
This commit is contained in:
parent
da25215ad7
commit
033b103d35
2
pom.xml
2
pom.xml
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>cn.lunadeer</groupId>
|
<groupId>cn.lunadeer</groupId>
|
||||||
<artifactId>Dominion</artifactId>
|
<artifactId>Dominion</artifactId>
|
||||||
<version>1.30.4-beta</version>
|
<version>1.30.5-beta</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>Dominion</name>
|
<name>Dominion</name>
|
||||||
|
@ -218,9 +218,7 @@ public class Cache {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public DominionDTO getDominion(Location loc) {
|
public DominionDTO getDominion(Location loc) {
|
||||||
List<DominionNode> tree = world_dominion_tree.get(loc.getWorld().getName());
|
return getLocInDominionDTO(world_dominion_tree.get(loc.getWorld().getName()), loc);
|
||||||
if (tree == null) return null;
|
|
||||||
return getLocInDominionDTO(tree, loc);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<DominionNode> getDominionTreeByPlayer(String player_name) {
|
public List<DominionNode> getDominionTreeByPlayer(String player_name) {
|
||||||
|
@ -44,7 +44,9 @@ public class DominionNode {
|
|||||||
return null;
|
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);
|
DominionNode dominionNode = getLocInDominionNode(nodes, loc);
|
||||||
return dominionNode == null ? null : dominionNode.dominion;
|
return dominionNode == null ? null : dominionNode.dominion;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user