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

change using wrong tupel

Browse Source
This commit is contained in:
Flemmli97 2020-09-29 20:21:16 +02:00
parent 2f9da2f0ce
commit 87d3a99908
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.txt
View File

@ -1,3 +1,7 @@
Flan 1.0.8
======================
- Changed using wrong tupel
Flan 1.0.7 Flan 1.0.7
====================== ======================
- Enable tamed pet interaction in claims for the owner - Enable tamed pet interaction in claims for the owner

2
gradle.properties
View File

@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx2G
loader_version=0.9.1+build.205 loader_version=0.9.1+build.205
# Mod Properties # Mod Properties
mod_version = 1.0.7 mod_version = 1.0.8
maven_group = com.flemmli97.flan maven_group = com.flemmli97.flan
archives_base_name = flan archives_base_name = flan

14
src/main/java/com/flemmli97/flan/claim/ClaimStorage.java
View File

@ -11,7 +11,6 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.ibm.icu.impl.Pair;
import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap; import it.unimi.dsi.fastutil.longs.Long2ObjectArrayMap;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.command.ServerCommandSource;
@ -22,6 +21,7 @@ import net.minecraft.text.HoverEvent;
import net.minecraft.text.MutableText; import net.minecraft.text.MutableText;
import net.minecraft.text.TranslatableText; import net.minecraft.text.TranslatableText;
import net.minecraft.util.Formatting; import net.minecraft.util.Formatting;
import net.minecraft.util.Pair;
import net.minecraft.util.WorldSavePath; import net.minecraft.util.WorldSavePath;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.ChunkPos;
@ -348,13 +348,13 @@ public class ClaimStorage {
List<File> childs = subClaimMap.get(parent); List<File> childs = subClaimMap.get(parent);
if (childs != null && !childs.isEmpty()) { if (childs != null && !childs.isEmpty()) {
for (File childF : childs) for (File childF : childs)
parentClaim.second.addSubClaimGriefprevention(parseFromYaml(childF, yml, server, perms).second); parentClaim.getRight().addSubClaimGriefprevention(parseFromYaml(childF, yml, server, perms).getRight());
} }
ClaimStorage storage = ClaimStorage.get(parentClaim.first); ClaimStorage storage = ClaimStorage.get(parentClaim.getLeft());
Set<Claim> conflicts = storage.conflicts(parentClaim.second, null); Set<Claim> conflicts = storage.conflicts(parentClaim.getRight(), null);
if (conflicts.isEmpty()) { if (conflicts.isEmpty()) {
parentClaim.second.setClaimID(storage.generateUUID()); parentClaim.getRight().setClaimID(storage.generateUUID());
storage.addClaim(parentClaim.second); storage.addClaim(parentClaim.getRight());
} else { } else {
src.sendFeedback(PermHelper.simpleColoredText(String.format(ConfigHandler.lang.readConflict, parent.getName(), conflicts), Formatting.DARK_RED), false); src.sendFeedback(PermHelper.simpleColoredText(String.format(ConfigHandler.lang.readConflict, parent.getName(), conflicts), Formatting.DARK_RED), false);
for (Claim claim : conflicts) { for (Claim claim : conflicts) {
@ -436,7 +436,7 @@ public class ClaimStorage {
accessors.forEach(s -> claim.setPlayerGroup(UUID.fromString(s), "Accessors", true)); accessors.forEach(s -> claim.setPlayerGroup(UUID.fromString(s), "Accessors", true));
} }
} }
return Pair.of(world, claim); return new Pair(world, claim);
} }
private static <T> List<T> readList(Map<String, Object> values, String key) { private static <T> List<T> readList(Map<String, Object> values, String key) {