flewkey/flan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix claim overlap at edge and wrong display for conflicting subclaims

Browse Source
This commit is contained in:
Flemmli97 2020-09-15 13:54:00 +02:00
parent 137ac03731
commit 1e167300ef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/flemmli97/flan/claim/Claim.java
View File

@ -148,7 +148,7 @@ public class Claim {
} }
public boolean intersects(Claim other) { public boolean intersects(Claim other) {
return this.minX < other.maxX && this.maxX > other.minX && this.minZ < other.maxZ && this.maxZ > other.minZ; return this.minX <= other.maxX && this.maxX >= other.minX && this.minZ <= other.maxZ && this.maxZ >= other.minZ;
} }
public boolean isCorner(BlockPos pos) { public boolean isCorner(BlockPos pos) {
@ -239,7 +239,7 @@ public class Claim {
Set<Claim> conflicts = Sets.newHashSet(); Set<Claim> conflicts = Sets.newHashSet();
for (Claim other : this.subClaims) for (Claim other : this.subClaims)
if (sub.intersects(other)) { if (sub.intersects(other)) {
conflicts.add(sub); conflicts.add(other);
} }
if (conflicts.isEmpty()) { if (conflicts.isEmpty()) {
sub.parent = this.claimID; sub.parent = this.claimID;

2
src/main/java/com/flemmli97/flan/event/ItemInteractEvents.java
View File

@ -160,7 +160,7 @@ public class ItemInteractEvents {
Set<Claim> fl = claim.tryCreateSubClaim(data.editingCorner(), target); Set<Claim> fl = claim.tryCreateSubClaim(data.editingCorner(), target);
data.addDisplayClaim(claim, EnumDisplayType.MAIN, player.getBlockPos().getY()); data.addDisplayClaim(claim, EnumDisplayType.MAIN, player.getBlockPos().getY());
if (!fl.isEmpty()) { if (!fl.isEmpty()) {
fl.forEach(confl -> data.addDisplayClaim(confl, EnumDisplayType.MAIN, player.getBlockPos().getY())); fl.forEach(confl -> data.addDisplayClaim(confl, EnumDisplayType.CONFLICT, player.getBlockPos().getY()));
player.sendMessage(PermHelper.simpleColoredText(ConfigHandler.lang.conflictOther, Formatting.RED), false); player.sendMessage(PermHelper.simpleColoredText(ConfigHandler.lang.conflictOther, Formatting.RED), false);
} else { } else {
player.sendMessage(PermHelper.simpleColoredText(ConfigHandler.lang.subClaimCreateSuccess, Formatting.GOLD), false); player.sendMessage(PermHelper.simpleColoredText(ConfigHandler.lang.subClaimCreateSuccess, Formatting.GOLD), false);