a

src/main/java/com/nexia/base/player/NexiaPlayer.java

@@ -52,6 +52,7 @@ public class NexiaPlayer extends WrappedPlayer {
     public void reset(boolean heal, Minecraft.GameMode gameMode) {
         this.setInvulnerabilityTime(0);
         this.clearEffects();
+        this.unwrap().setAbsorptionAmount(0);
         this.getInventory().clear();
         this.setRemainingFireTicks(0);
         this.setExperienceLevel(0);
@@ -92,6 +93,7 @@ public class NexiaPlayer extends WrappedPlayer {
 
         this.setInvulnerabilityTime(0);
         this.clearEffects();
+        this.unwrap().setAbsorptionAmount(0);
         this.setRemainingFireTicks(0);
         this.setGlowing(false);
 

src/main/java/com/nexia/core/commands/staff/MapCommand.java

@@ -3,9 +3,10 @@ package com.nexia.core.commands.staff;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.nexia.base.player.NexiaPlayer;
 import com.nexia.core.utilities.chat.ChatFormat;
 import com.nexia.core.utilities.commands.CommandUtil;
-import com.nexia.base.player.NexiaPlayer;
 import com.nexia.core.utilities.time.ServerTime;
 import com.nexia.core.utilities.world.WorldUtil;
 import com.nexia.nexus.api.command.CommandSourceInfo;
@@ -14,13 +15,17 @@ import com.nexia.nexus.api.world.entity.player.Player;
 import com.nexia.nexus.api.world.util.Location;
 import net.kyori.adventure.text.Component;
 import net.minecraft.commands.SharedSuggestionProvider;
+import net.minecraft.commands.arguments.ResourceLocationArgument;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
 import org.apache.commons.io.FileUtils;
-
+import org.jetbrains.annotations.NotNull;
 import java.io.File;
+import static net.minecraft.server.commands.LocateBiomeCommand.ERROR_INVALID_BIOME;
 
 public class MapCommand {
     public static void register(CommandDispatcher<CommandSourceInfo> dispatcher) {
@@ -28,24 +33,32 @@ public class MapCommand {
                 .requires(commandSourceInfo -> CommandUtil.hasPermission(commandSourceInfo, "nexia.staff.map", 2))
                 .then(CommandUtils.argument("type", StringArgumentType.string())
                         .suggests(((context, builder) -> SharedSuggestionProvider.suggest((new String[]{"delete", "create", "tp"}), builder)))
-                        .then(CommandUtils.argument("map", StringArgumentType.greedyString())
+                        .then(CommandUtils.argument("map", ResourceLocationArgument.id())
                                 .suggests(((context, builder) -> SharedSuggestionProvider.suggest((WorldUtil.getAllWorldsId()), builder)))
-                                .executes(MapCommand::run)
+                                .executes((context -> run(context, StringArgumentType.getString(context, "type"), context.getArgument("map", ResourceLocation.class), Biomes.THE_VOID)))
+                                .then(CommandUtils.argument("biome", ResourceLocationArgument.id())
+                                        .suggests(((context, builder) -> SharedSuggestionProvider.suggestResource((ServerTime.minecraftServer.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).keySet()), builder)))
+                                        .executes((context -> run(context, StringArgumentType.getString(context, "type"), context.getArgument("map", ResourceLocation.class), context.getArgument("biome", ResourceLocation.class))))
+                                )
                         )
                 )
         ));
     }
 
-    private static int run(CommandContext<CommandSourceInfo> context) {
+    private static int run(CommandContext<CommandSourceInfo> context, String type, ResourceLocation map, ResourceLocation biomeLocation) throws CommandSyntaxException {
+        // check if biome is valid
+        ServerTime.minecraftServer.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY).getOptional(biomeLocation).orElseThrow(() -> ERROR_INVALID_BIOME.create(biomeLocation));
+
+        return run(context, type, map, ResourceKey.create(Registry.BIOME_REGISTRY, biomeLocation));
+    }
+
+    private static int run(CommandContext<CommandSourceInfo> context, String type, ResourceLocation map, @NotNull ResourceKey<Biome> biome) {
         NexiaPlayer player = null;
         if(context.getSource().getExecutingEntity() instanceof Player nexusPlayer) {
             player = new NexiaPlayer(nexusPlayer);
         }
 
-        String type = StringArgumentType.getString(context, "type");
-        String map = StringArgumentType.getString(context, "map");
-
-        if(map.trim().isEmpty() || type.trim().isEmpty()) {
+        if(map == null || map.toString().trim().isEmpty() || type.trim().isEmpty()) {
             context.getSource().sendMessage(
                     ChatFormat.nexiaMessage
                             .append(Component.text("Invalid name!", ChatFormat.failColor))
@@ -53,18 +66,16 @@ public class MapCommand {
             return 1;
         }
 
-        String[] mapname = map.split(":");
-
         if(type.equalsIgnoreCase("create")){
 
-            ServerLevel level = ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(mapname[0], mapname[1])).location(), (WorldUtil.defaultWorldConfig)).asWorld();
+            ServerLevel level = ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, map).location(), (WorldUtil.defaultWorldConfig.setGenerator(WorldUtil.getChunkGenerator(biome)))).asWorld();
 
             if (player != null) {
                 player.teleport(new Location(0, 80, 0, 0, 0, WorldUtil.getWorld(level)));
 
                 player.sendNexiaMessage(
                         Component.text("Created map called: ", ChatFormat.normalColor)
-                                .append(Component.text(map, ChatFormat.brandColor2))
+                                .append(Component.text(map.toString(), ChatFormat.brandColor2))
                 );
             }
 
@@ -73,29 +84,29 @@ public class MapCommand {
         }
 
         if (type.equalsIgnoreCase("delete")) {
-            ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(mapname[0], mapname[1])).location(), null).delete();
+            ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, map).location(), null).delete();
             if(player != null) {
                 player.sendNexiaMessage(
                         Component.text("Deleted map called: ", ChatFormat.normalColor)
-                                .append(Component.text(map, ChatFormat.brandColor2))
+                                .append(Component.text(map.toString(), ChatFormat.brandColor2))
                 );
             }
 
             try {
-                FileUtils.forceDeleteOnExit(new File("/world/dimensions/" + mapname[0], mapname[1]));
+                FileUtils.forceDeleteOnExit(new File("/world/dimensions/" + map.getNamespace(), map.getPath()));
             } catch (Exception ignored) { }
             return 1;
         }
 
         if(type.equalsIgnoreCase("tp")) {
-            ServerLevel level = ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, new ResourceLocation(mapname[0], mapname[1])).location(), null).asWorld();
+            ServerLevel level = ServerTime.fantasy.getOrOpenPersistentWorld(ResourceKey.create(Registry.DIMENSION_REGISTRY, map).location(), null).asWorld();
 
             if(player != null) {
                 player.teleport(new Location(0, 80, 0, 0, 0, WorldUtil.getWorld(level)));
 
                 player.sendNexiaMessage(
                         Component.text("Teleported to map called: ", ChatFormat.normalColor)
-                                .append(Component.text(map, ChatFormat.brandColor2))
+                                .append(Component.text(map.toString(), ChatFormat.brandColor2))
                 );
             }
 

src/main/java/com/nexia/core/games/util/LobbyUtil.java

@@ -122,20 +122,20 @@ public class LobbyUtil {
 
     public static void giveItems(NexiaPlayer player) {
 
-        NBTObject hideAttrubtesNBTObject = NBTObject.create();
-        hideAttrubtesNBTObject.set("HideFlags", NBTValue.of(39));
+        NBTObject hideAttributesNBTObject = NBTObject.create();
+        hideAttributesNBTObject.set("HideFlags", NBTValue.of(39));
 
-        NBTObject unbreakableNBTObject = hideAttrubtesNBTObject.copy();
+        NBTObject unbreakableNBTObject = hideAttributesNBTObject.copy();
         unbreakableNBTObject.set("Unbreakable", NBTValue.of(1));
 
         com.nexia.nexus.api.world.item.ItemStack compass = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.COMPASS);
-        compass.setItemNBT(hideAttrubtesNBTObject.copy());
+        compass.setItemNBT(hideAttributesNBTObject.copy());
         compass.setLore(Component.text("Right click to open the gamemode selector menu.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
         compass.setDisplayName(Component.text("Gamemode Selector", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
 
 
         com.nexia.nexus.api.world.item.ItemStack nameTag = com.nexia.nexus.api.world.item.ItemStack.create(Minecraft.Item.NAME_TAG);
-        nameTag.setItemNBT(hideAttrubtesNBTObject.copy());
+        nameTag.setItemNBT(hideAttributesNBTObject.copy());
         nameTag.setLore(Component.text("Right click to open the prefix selector menu.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false));
         nameTag.setDisplayName(Component.text("Prefix Selector", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false));
 

src/main/java/com/nexia/core/listeners/nexus/PlayerDeathListener.java

@@ -40,7 +40,6 @@ public class PlayerDeathListener {
 
             if(gameMode == PlayerGameMode.SKYWARS) {
                 SkywarsGame.death(nexiaPlayer, playerDeathEvent);
-                return;
             }
 
             if(gameMode == PlayerGameMode.LOBBY && duelsData.gameOptions != null) {

src/main/java/com/nexia/core/listeners/nexus/PlayerDropItemListener.java

@@ -7,7 +7,6 @@ import com.nexia.base.player.NexiaPlayer;
 public class PlayerDropItemListener {
     public void registerListener(){
         PlayerHotbarDropItemEvent.BACKEND.register(playerDropItemEvent -> {
-
             NexiaPlayer player = new NexiaPlayer(playerDropItemEvent.getPlayer());
 
             if (!EventUtil.dropItem(player, playerDropItemEvent.getItemStack())) {

src/main/java/com/nexia/core/listeners/nexus/PlayerJoinListener.java

@@ -19,6 +19,7 @@ import net.kyori.adventure.text.event.HoverEvent;
 import net.minecraft.stats.Stats;
 
 import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
 
 import static com.nexia.discord.NexiaDiscord.jda;
 
@@ -31,7 +32,8 @@ public class PlayerJoinListener {
 
             //setJoinMessage(player, playerJoinEvent);
 
-            PlayerDataManager.dataManagerMap.forEach((resourceLocation, playerDataManager) -> playerDataManager.addPlayerData(player));
+            if (!player.getTags().contains("bot"))
+                CompletableFuture.runAsync(() -> PlayerDataManager.dataManagerMap.forEach((resourceLocation, playerDataManager) -> playerDataManager.addPlayerData(player)));
 
             LobbyUtil.returnToLobby(player, true);
             checkBooster(player);

src/main/java/com/nexia/core/listeners/nexus/PlayerLeaveListener.java

@@ -6,6 +6,8 @@ import com.nexia.core.utilities.chat.ChatFormat;
 import com.nexia.nexus.api.event.player.PlayerDisconnectEvent;
 import net.kyori.adventure.text.Component;
 
+import java.util.concurrent.CompletableFuture;
+
 public class PlayerLeaveListener {
     public void registerListener() {
         PlayerDisconnectEvent.BACKEND.register(playerDisconnectEvent -> {
@@ -14,8 +16,8 @@ public class PlayerLeaveListener {
 
             //setLeaveMessage(player, playerDisconnectEvent);
 
-            if (playerDisconnectEvent.getPlayer().hasTag("bot")) return;
-            PlayerDataManager.dataManagerMap.forEach((resourceLocation, playerDataManager) -> playerDataManager.removePlayerData(player));
+            if (!player.getTags().contains("bot"))
+                CompletableFuture.runAsync(() -> PlayerDataManager.dataManagerMap.forEach((resourceLocation, playerDataManager) -> playerDataManager.removePlayerData(player)));
         });
     }
 

src/main/java/com/nexia/core/mixin/entity/ThrownTridentMixin.java

@@ -1,16 +1,11 @@
 package com.nexia.core.mixin.entity;
 
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.projectile.AbstractArrow;
 import net.minecraft.world.entity.projectile.ThrownTrident;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(ThrownTrident.class)
 public abstract class ThrownTridentMixin extends AbstractArrow {

src/main/java/com/nexia/core/mixin/player/PlayerListMixin.java

@@ -1,23 +1,15 @@
 package com.nexia.core.mixin.player;
 
-import com.llamalad7.mixinextras.sugar.Local;
 import com.mojang.authlib.GameProfile;
 import com.nexia.base.player.NexiaPlayer;
 import com.nexia.base.player.PlayerDataManager;
 import com.nexia.core.NexiaCore;
-import com.nexia.core.games.util.LobbyUtil;
 import com.nexia.core.utilities.chat.ChatFormat;
 import com.nexia.core.utilities.chat.PlayerMutes;
 import com.nexia.core.utilities.player.BanHandler;
 import com.nexia.core.utilities.player.CorePlayerData;
 import com.nexia.core.utilities.time.ServerTime;
 import com.nexia.discord.NexiaDiscord;
-import com.nexia.ffa.FfaUtil;
-import com.nexia.minigames.games.bedwars.players.BwPlayerEvents;
-import com.nexia.minigames.games.bedwars.util.BwUtil;
-import com.nexia.minigames.games.skywars.SkywarsGame;
-import com.nexia.nexus.api.world.World;
-import com.nexia.nexus.api.world.types.Minecraft;
 import com.nexia.nexus.builder.implementation.util.ObjectMappings;
 import de.themoep.minedown.adventure.MineDown;
 import net.minecraft.ChatFormatting;

src/main/java/com/nexia/core/mixin/player/PlayerMixin.java

@@ -23,7 +23,6 @@ import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemCooldowns;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
 import org.spongepowered.asm.mixin.*;
 import org.spongepowered.asm.mixin.injection.At;
@@ -38,8 +37,6 @@ public abstract class PlayerMixin extends LivingEntity {
 
     @Shadow @Final public Inventory inventory;
 
-    @Shadow public abstract ItemCooldowns getCooldowns();
-
     protected PlayerMixin(EntityType<? extends LivingEntity> entityType, Level level) {
         super(entityType, level);
     }
@@ -123,12 +120,4 @@ public abstract class PlayerMixin extends LivingEntity {
     public boolean setSprintFix(boolean par1) {
         return ((CoreSavedPlayerData)PlayerDataManager.getDataManager(NexiaCore.CORE_DATA_MANAGER).get(this.getUUID()).savedData).isSprintFix();
     }
-
-    @Inject(method = "hurt", at = @At("HEAD"), cancellable = true)
-    public void shieldBlockExplosion(DamageSource damageSource, float f, CallbackInfoReturnable<Boolean> cir) {
-        if (damageSource.isExplosion() && this.useItem.getItem() == Items.SHIELD) {
-            this.hurtCurrentlyUsedShield(f);
-            cir.setReturnValue(false);
-        }
-    }
 }

src/main/java/com/nexia/ffa/base/BaseFfaUtil.java

@@ -254,7 +254,7 @@ public abstract class BaseFfaUtil {
         }
 
         if(layout != null) {
-            InventoryMerger.mergeSafe(player.unwrap(), layout.asPlayerInventory(), defaultInventory.asPlayerInventory());
+            player.unwrap().inventory.replaceWith(layout.asPlayerInventory());
         } else {
             player.unwrap().inventory.replaceWith(defaultInventory.asPlayerInventory());
         }

src/main/java/com/nexia/minigames/games/duels/DuelGameHandler.java

@@ -94,7 +94,7 @@ public class DuelGameHandler {
         }
 
         if(layout != null) {
-            InventoryMerger.mergeSafe(player.unwrap(), layout.asPlayerInventory(), defaultInventory.asPlayerInventory());
+            player.unwrap().inventory.replaceWith(layout.asPlayerInventory());
         } else {
             InventoryUtil.loadInventory(player, "duels", gameMode.toLowerCase());
         }

src/main/java/com/nexia/minigames/games/duels/map/DuelsMap.java

@@ -32,14 +32,14 @@ public class DuelsMap {
 
     public StructureMap structureMap;
 
+    public static final DuelsMap COURTYARD = new DuelsMap("Courtyard", true, Items.LODESTONE, new EntityPos(0.5, 80, 24.5, 180, 0), new EntityPos(0.5, 80, -23.5, 0, 0), new StructureMap(new Identifier("duels", "courtyard"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-70, -10, -70), true));
+    public static final DuelsMap COLOSSEUM = new DuelsMap("Colosseum", true, Items.SANDSTONE, new EntityPos(0.5, 80, 24.5, 180, 0), new EntityPos(0.5, 80, -23.5, 0, 0), new StructureMap(new Identifier("duels", "colosseum"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-55, -12, -61), true));
+    public static final DuelsMap PLAINS = new DuelsMap("Plains", true, Items.GRASS_BLOCK, new EntityPos(-63.5, 80, -0.5, -90, 0), new EntityPos(64.5, 80, 0.5, 90, 0), new StructureMap(new Identifier("duels", "plains"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-78, -8, -59), true));
+    public static final DuelsMap NETHFLAT = new DuelsMap("Neth Flat", true, Items.NETHERITE_BLOCK, new EntityPos(0, 80, -41, 0, 0), new EntityPos(0, 80, 41 ,180, 0), new StructureMap(new Identifier("duels", "nethflat"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-36, -3, -51), true));
+    public static final DuelsMap EDEN = new DuelsMap("Eden", false, Items.ALLIUM, new EntityPos(55, 80, 0, 90, 0), new EntityPos(-55, 80, 0, -90, 0), new StructureMap(new Identifier("duels", "eden"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-62, -7, -23), true));
+    public static final DuelsMap CASTLE = new DuelsMap("Castle", false, Items.CRACKED_STONE_BRICKS, new EntityPos(0, 240, 25, -180, 0), new EntityPos(0, 240, -25, 0, 0), new StructureMap(new Identifier("duels", "castle"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 238, 0), new BlockPos(-11, -4, -30), true));
+    public static final DuelsMap BIGROOM = new DuelsMap("Big Room", true, Items.OAK_PLANKS, new EntityPos(-40.5, 80, 0.5, -90, 0), new EntityPos(41.5, 80, 0.5, 90, 0), new StructureMap(new Identifier("duels", "bigroom"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-50, -16, -65), true));
     public static final DuelsMap CITY = new DuelsMap("city", true, Items.SMOOTH_STONE, new EntityPos(-55, 80, 0, -90, 0), new EntityPos(17, 80, 0, 90, 0), new StructureMap(new Identifier("duels", "city"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-65, -11, -31), true));
-    public static final DuelsMap NETHFLAT = new DuelsMap("nethflat", true, Items.NETHERITE_BLOCK, new EntityPos(0, 80, -41, 0, 0), new EntityPos(0, 80, 41 ,180, 0), new StructureMap(new Identifier("duels", "nethflat"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-36, -3, -51), true));
-    public static final DuelsMap PLAINS = new DuelsMap("plains", true, Items.GRASS_BLOCK, new EntityPos(-63.5, 80, -0.5, -90, 0), new EntityPos(64.5, 80, 0.5, 90, 0), new StructureMap(new Identifier("duels", "plains"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-78, -8, -59), true));
-    public static final DuelsMap EDEN = new DuelsMap("eden", false, Items.ALLIUM, new EntityPos(55, 80, 0, 90, 0), new EntityPos(-55, 80, 0, -90, 0), new StructureMap(new Identifier("duels", "eden"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-62, -7, -23), true));
-    public static final DuelsMap CASTLE = new DuelsMap("castle", false, Items.CRACKED_STONE_BRICKS, new EntityPos(0, 240, 25, -180, 0), new EntityPos(0, 240, -25, 0, 0), new StructureMap(new Identifier("duels", "castle"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 238, 0), new BlockPos(-11, -4, -30), true));
-    public static final DuelsMap BIGROOM = new DuelsMap("bigroom", true, Items.OAK_PLANKS, new EntityPos(-40.5, 80, 0.5, -90, 0), new EntityPos(41.5, 80, 0.5, 90, 0), new StructureMap(new Identifier("duels", "bigroom"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-50, -16, -65), true));
-    public static final DuelsMap COLOSSEUM = new DuelsMap("colosseum", true, Items.GILDED_BLACKSTONE, new EntityPos(0.5, 80, 20.5, 180, 0), new EntityPos(0.5, 80, -19.5, 0, 0), new StructureMap(new Identifier("duels", "colosseum"), StructureMap.Rotation.NO_ROTATION, true, new BlockPos(0, 80, 0), new BlockPos(-35, -7, -31), true));
-
     public static DuelsMap identifyMap(String name) {
         for(DuelsMap map : DuelsMap.duelsMaps) {
             if(map.id.equalsIgnoreCase(name)) return map;

src/main/java/com/nexia/minigames/games/duels/team/TeamDuelsGame.java

@@ -198,27 +198,35 @@ public class TeamDuelsGame extends DuelsGame {
                     this.level, color);
             this.currentEndTime++;
             if (this.currentEndTime >= this.endTime || !this.shouldWait) {
-                DuelsTeam winnerTeam = this.winner;
-                DuelsTeam loserTeam = this.loser;
+                DuelsTeam winnerTeam = this.winner == null ? this.team1 : this.winner;
+                DuelsTeam loserTeam = this.loser == null ? this.team2 : this.loser;
 
                 for (NexiaPlayer spectator : this.spectators) {
+                    spectator = spectator.refreshPlayer();
                     spectator.runCommand("/hub", 0, false);
                 }
 
                 this.isEnding = false;
 
-                for (NexiaPlayer player : loserTeam.all) {
-                    ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(player)).gameOptions = null;
-                    player.runCommand("/hub", 0, false);
+                if(loserTeam != null) {
+                    for (NexiaPlayer player : loserTeam.all) {
+                        player = player.refreshPlayer();
+                        ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(player)).gameOptions = null;
+                        player.runCommand("/hub", 0, false);
+                    }
+                    loserTeam.refreshTeam();
                 }
-                for (NexiaPlayer player : winnerTeam.all) {
-                    ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(player)).gameOptions = null;
-                    player.runCommand("/hub", 0, false);
+
+                if(winnerTeam != null) {
+                    for (NexiaPlayer player : winnerTeam.all) {
+                        player = player.refreshPlayer();
+                        ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(player)).gameOptions = null;
+                        player.runCommand("/hub", 0, false);
+                    }
+                    winnerTeam.refreshTeam();
                 }
 
                 DuelGameHandler.deleteWorld(String.valueOf(this.uuid));
-                this.team1.refreshTeam();
-                this.team2.refreshTeam();
                 removeDuelsGame();
                 return;
             }

src/main/java/com/nexia/minigames/games/duels/util/DuelOptions.java

@@ -51,7 +51,6 @@ public class DuelOptions {
         public InviteOptions reset() {
             this.invitingPlayer = null;
             this.inviting = false;
-            this.inviteMap = DuelsMap.CITY;
             this.inviteKit = "";
             this.inviteKit2 = null;
             this.customDuel = false;