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

修复了判断是否在领地内没有判断所属世界的错误
Java CI-CD with Maven / build (push) Failing after 33m35s Details

This commit is contained in:
zhangyuheng 2024-02-25 00:53:12 +08:00
parent 2041056ad3
commit ca4116d467
2 changed files with 9 additions and 3 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.10.5-beta</version>
<version>1.10.6-beta</version>
<packaging>jar</packaging>
<name>Dominion</name>

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

@ -6,6 +6,7 @@ import cn.lunadeer.dominion.utils.Notification;
import cn.lunadeer.dominion.utils.XLogger;
import net.kyori.adventure.text.Component;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.entity.Player;
import javax.annotation.Nullable;
@ -154,7 +155,7 @@ public class Cache {
List<DominionDTO> in_dominions = new ArrayList<>();
for (Integer id : dominions_id) {
DominionDTO d = id_dominions.get(id);
if (isInDominion(d, loc.getX(), loc.getY(), loc.getZ())) {
if (isInDominion(d, loc)) {
in_dominions.add(d);
}
}
@ -178,6 +179,7 @@ public class Cache {
private static boolean isInDominion(@Nullable DominionDTO dominion, Player player) {
if (dominion == null) return false;
if (!Objects.equals(dominion.getWorld(), player.getWorld().getName())) return false;
double x = player.getLocation().getX();
double y = player.getLocation().getY();
double z = player.getLocation().getZ();
@ -186,8 +188,12 @@ public class Cache {
z >= dominion.getZ1() && z <= dominion.getZ2();
}
private static boolean isInDominion(@Nullable DominionDTO dominion, double x, double y, double z) {
private static boolean isInDominion(@Nullable DominionDTO dominion, Location location) {
if (dominion == null) return false;
if (!Objects.equals(dominion.getWorld(), location.getWorld().getName())) return false;
double x = location.getX();
double y = location.getY();
double z = location.getZ();
return x >= dominion.getX1() && x <= dominion.getX2() &&
y >= dominion.getY1() && y <= dominion.getY2() &&
z >= dominion.getZ1() && z <= dominion.getZ2();