Merge pull request RobertSkalko#6 from SaloEater/Command-give-map-gives-correct-rarity

Command /mns give map now gives correct map rarity

Author: mahjerion

src/main/java/com/robertx22/addons/dungeon_realm/DungeonAddonEvents.java

@@ -157,7 +157,7 @@ static boolean checkCooldown(Player p) {
     }
 
     static boolean meetsResists(Player p, MapItemData data) {
-        if (!data.getStatReq().meetsReq(Load.Unit(p).getLevel(), Load.Unit(p))) {
+        if (!data.getStatReq().meetsReq(Load.Unit(p).getLevel(), Load.Unit(p)) && !p.isCreative()) {
             ExplainedResultUtil.sendErrorMessage(p, Chats.MAP_DEVICE_USE_ERROR, Chats.RESISTS_TOO_LOW_FOR_MAP);
 
             List<Component> reqDifference = data.getStatReq().getReqDifference(data.lvl, Load.Unit(p));

src/main/java/com/robertx22/mine_and_slash/vanilla_mc/commands/giveitems/GiveMap.java

@@ -7,12 +7,14 @@
 import com.robertx22.mine_and_slash.database.registry.ExileDB;
 import com.robertx22.mine_and_slash.loot.LootInfo;
 import com.robertx22.mine_and_slash.loot.blueprints.MapBlueprint;
+import com.robertx22.mine_and_slash.uncommon.datasaving.StackSaving;
 import com.robertx22.mine_and_slash.uncommon.utilityclasses.PlayerUtils;
 import com.robertx22.mine_and_slash.vanilla_mc.commands.CommandRefs;
 import com.robertx22.mine_and_slash.vanilla_mc.commands.suggestions.GearRaritySuggestions;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.EntityArgument;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 
 import java.util.Objects;
 
@@ -48,16 +50,20 @@ private static int execute(CommandSourceStack commandSource, Player player, int
             }
         }
         for (int i = 0; i < amount; i++) {
-            MapBlueprint blueprint = new MapBlueprint(LootInfo.ofLevel(lvl));
-            blueprint.level.set(lvl);
+            MapBlueprint blueprint = new MapBlueprint(LootInfo.ofLevel(1));
+            ItemStack mapStack = blueprint.createStack();
+
+            MapBlueprint b = new MapBlueprint(LootInfo.ofLevel(lvl));
+            b.level.set(lvl);
 
             if (ExileDB.GearRarities()
                     .isRegistered(rarity)) {
-                blueprint.rarity.set(ExileDB.GearRarities()
+                b.rarity.set(ExileDB.GearRarities()
                         .get(rarity));
             }
 
-            PlayerUtils.giveItem(blueprint.createStack(), player);
+            StackSaving.MAP.saveTo(mapStack, b.createData());
+            PlayerUtils.giveItem(mapStack, player);
         }
 
         return 0;