Skip to content

Commit

Permalink
FfaAreas? Never heard of her
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandra-Myers committed Jul 26, 2024
1 parent 765ec43 commit 3b89220
Show file tree
Hide file tree
Showing 28 changed files with 278 additions and 234 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.nexia.core.utilities.chat.LegacyChatFormat;
import com.nexia.core.utilities.misc.RandomUtil;
import com.nexia.core.utilities.time.ServerTime;
import com.nexia.ffa.uhc.utilities.FfaAreas;
import com.nexia.ffa.uhc.utilities.UhcFfaAreas;
import com.nexia.minigames.games.skywars.SkywarsGame;
import com.nexia.minigames.games.skywars.SkywarsMap;
import io.github.blumbo.inventorymerger.saving.SavableInventory;
Expand Down Expand Up @@ -77,7 +77,7 @@ private static int run(CommandContext<CommandSourceStack> context) throws Comman

player.teleportTo(level, 0, 80, 0, 0, 0);
} else if(argument.equalsIgnoreCase("rluhc")) {
FfaAreas.resetMap(true);
UhcFfaAreas.resetMap(true);
player.sendMessage(LegacyChatFormat.format("Reloaded UHC Map."), Util.NIL_UUID);
} else if(argument.contains("swmap")) {
SkywarsMap map = SkywarsMap.identifyMap(name);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.nexia.ffa.sky.utilities.SkyFfaAreas;
import com.nexia.minigames.games.bedwars.areas.BwAreas;
import me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.commands.CommandSourceStack;
Expand Down Expand Up @@ -30,7 +31,7 @@ public static int bedwars(CommandContext<CommandSourceStack> context) throws Com

public static int ffa_sky(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
ServerPlayer player = context.getSource().getPlayerOrException();
com.nexia.ffa.sky.utilities.FfaAreas.createProtectionMap(player);
SkyFfaAreas.createProtectionMap(player);
return 1;
}
}
21 changes: 12 additions & 9 deletions src/main/java/com/nexia/core/gui/PlayGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@

import com.nexia.base.player.PlayerDataManager;
import com.nexia.core.NexiaCore;
import com.nexia.ffa.kits.utilities.KitFfaAreas;
import com.nexia.ffa.sky.utilities.SkyFfaAreas;
import com.nexia.ffa.uhc.utilities.UhcFfaAreas;
import com.nexia.minigames.games.duels.util.player.DuelsPlayerData;
import com.nexia.nexus.builder.implementation.util.ObjectMappings;
import com.nexia.core.games.util.LobbyUtil;
import com.nexia.core.utilities.chat.ChatFormat;
import com.nexia.core.utilities.item.ItemDisplayUtil;
import com.nexia.base.player.NexiaPlayer;
import com.nexia.core.utilities.time.ServerTime;
import com.nexia.ffa.classic.utilities.FfaAreas;
import com.nexia.ffa.classic.utilities.ClassicFfaAreas;
import com.nexia.minigames.games.bedwars.areas.BwAreas;
import com.nexia.minigames.games.duels.DuelGameMode;
import com.nexia.minigames.games.football.FootballGame;
Expand Down Expand Up @@ -39,10 +42,10 @@ private void fillEmptySlots(ItemStack itemStack){
}
private void setMainLayout(){

int players = FfaAreas.ffaWorld.players().size();
players = players + com.nexia.ffa.kits.utilities.FfaAreas.ffaWorld.players().size();
players = players + com.nexia.ffa.sky.utilities.FfaAreas.ffaWorld.players().size();
players = players + com.nexia.ffa.uhc.utilities.FfaAreas.ffaWorld.players().size();
int players = ClassicFfaAreas.ffaWorld.players().size();
players = players + KitFfaAreas.ffaWorld.players().size();
players = players + SkyFfaAreas.ffaWorld.players().size();
players = players + UhcFfaAreas.ffaWorld.players().size();

ItemStack ffa = new ItemStack(Items.NETHERITE_SWORD, 1);
ffa.setHoverName(ObjectMappings.convertComponent(net.kyori.adventure.text.Component.text("FFA", ChatFormat.Minecraft.aqua).decoration(ChatFormat.italic, false)));
Expand Down Expand Up @@ -125,7 +128,7 @@ public void setFFALayout(){
ItemDisplayUtil.addLore(classic, net.kyori.adventure.text.Component.text("The classic snapshot", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 1);
ItemDisplayUtil.addLore(classic, net.kyori.adventure.text.Component.text("Free For All gamemode.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 2);
ItemDisplayUtil.addLore(classic, "§f", 3);
ItemDisplayUtil.addLore(classic, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", FfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.aqua).decoration(ChatFormat.italic, false), 4);
ItemDisplayUtil.addLore(classic, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", ClassicFfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.aqua).decoration(ChatFormat.italic, false), 4);

ItemStack kit = new ItemStack(Items.CROSSBOW, 1);
kit.setHoverName(ObjectMappings.convertComponent(net.kyori.adventure.text.Component.text("Kit FFA", ChatFormat.Minecraft.white).decoration(ChatFormat.italic, false)));
Expand All @@ -136,7 +139,7 @@ public void setFFALayout(){
ItemDisplayUtil.addLore(kit, net.kyori.adventure.text.Component.text("Fight against players", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 1);
ItemDisplayUtil.addLore(kit, net.kyori.adventure.text.Component.text("with various kits!", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 2);
ItemDisplayUtil.addLore(kit, "§f", 3);
ItemDisplayUtil.addLore(kit, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", com.nexia.ffa.kits.utilities.FfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.white).decoration(ChatFormat.italic, false), 4);
ItemDisplayUtil.addLore(kit, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", KitFfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.white).decoration(ChatFormat.italic, false), 4);

ItemStack skyffa = new ItemStack(Items.POTION, 1);
skyffa.setHoverName(ObjectMappings.convertComponent(net.kyori.adventure.text.Component.text("Sky FFA", ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false)));
Expand All @@ -148,7 +151,7 @@ public void setFFALayout(){
ItemDisplayUtil.addLore(skyffa, net.kyori.adventure.text.Component.text("Fight people on sky islands", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 1);
ItemDisplayUtil.addLore(skyffa, net.kyori.adventure.text.Component.text("and drink Piss Juice™ to survive!", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 2);
ItemDisplayUtil.addLore(skyffa, "§5", 3);
ItemDisplayUtil.addLore(skyffa, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", com.nexia.ffa.sky.utilities.FfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false), 4);
ItemDisplayUtil.addLore(skyffa, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", SkyFfaAreas.ffaWorld.players().size()), ChatFormat.Minecraft.yellow).decoration(ChatFormat.italic, false), 4);

ItemStack uhc = new ItemStack(Items.GOLDEN_APPLE, 1);
uhc.setHoverName(ObjectMappings.convertComponent(net.kyori.adventure.text.Component.text("UHC FFA", ChatFormat.goldColor).decoration(ChatFormat.italic, false)));
Expand All @@ -159,7 +162,7 @@ public void setFFALayout(){
ItemDisplayUtil.addLore(uhc, net.kyori.adventure.text.Component.text("A FFA to practice PvP", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 1);
ItemDisplayUtil.addLore(uhc, net.kyori.adventure.text.Component.text("for the UHC gamemode.", ChatFormat.Minecraft.gray).decoration(ChatFormat.italic, false), 2);
ItemDisplayUtil.addLore(uhc, "§f", 3);
ItemDisplayUtil.addLore(uhc, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", com.nexia.ffa.uhc.utilities.FfaAreas.ffaWorld.players().size()), ChatFormat.goldColor).decoration(ChatFormat.italic, false), 4);
ItemDisplayUtil.addLore(uhc, net.kyori.adventure.text.Component.text(String.format("There are %s people playing this gamemode.", UhcFfaAreas.ffaWorld.players().size()), ChatFormat.goldColor).decoration(ChatFormat.italic, false), 4);

ItemStack emptySlot = new ItemStack(Items.BLACK_STAINED_GLASS_PANE, 1);
emptySlot.setHoverName(new TextComponent(""));
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/nexia/core/gui/ffa/SpawnGUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.nexia.core.utilities.chat.ChatFormat;
import com.nexia.core.utilities.item.ItemDisplayUtil;
import com.nexia.base.player.NexiaPlayer;
import com.nexia.ffa.classic.utilities.FfaAreas;
import com.nexia.ffa.classic.utilities.ClassicFfaAreas;
import eu.pb4.sgui.api.ClickType;
import eu.pb4.sgui.api.elements.GuiElementInterface;
import eu.pb4.sgui.api.gui.SimpleGui;
Expand Down Expand Up @@ -111,7 +111,7 @@ public static void teleportPlayer(ServerPlayer minecraftPlayer, String name) {
int[] pos = mapLocations.get(name);
NexiaPlayer player = new NexiaPlayer(minecraftPlayer);
if(pos != null){
minecraftPlayer.teleportTo(FfaAreas.ffaWorld, pos[0], pos[1], pos[2], pos[3], pos[4]);
minecraftPlayer.teleportTo(ClassicFfaAreas.ffaWorld, pos[0], pos[1], pos[2], pos[3], pos[4]);
player.sendMessage(
ChatFormat.nexiaMessage
.append(Component.text("You have been teleported to: ").color(ChatFormat.normalColor).decoration(ChatFormat.bold, false))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
import com.nexia.base.player.PlayerDataManager;
import com.nexia.core.NexiaCore;
import com.nexia.core.utilities.player.CorePlayerData;
import com.nexia.core.utilities.time.ServerTime;
import com.nexia.ffa.uhc.utilities.FfaAreas;
import com.nexia.minigames.games.skywars.util.player.SkywarsPlayerData;
import com.nexia.nexus.api.event.player.PlayerRespawnEvent;
import com.nexia.nexus.api.world.types.Minecraft;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/nexia/core/mixin/block/BlockMixin.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.nexia.core.mixin.block;

import com.nexia.ffa.sky.utilities.FfaAreas;
import com.nexia.ffa.sky.utilities.FfaSkyUtil;
import com.nexia.minigames.games.bedwars.areas.BwAreas;
import com.nexia.minigames.games.bedwars.util.BwUtil;
import net.minecraft.core.BlockPos;
Expand All @@ -25,7 +25,7 @@ public class BlockMixin {
private static void dropResources(BlockState blockState, Level level, BlockPos blockPos, BlockEntity blockEntity, Entity breakerEntity, ItemStack tool, CallbackInfo ci) {
if (!(level instanceof ServerLevel serverLevel)) return;

if ((BwAreas.isBedWarsWorld(serverLevel) && !(BwUtil.dropResources(blockState))) || FfaAreas.isFfaWorld(serverLevel)) {
if ((BwAreas.isBedWarsWorld(serverLevel) && !(BwUtil.dropResources(blockState))) || FfaSkyUtil.INSTANCE.isFfaWorld(serverLevel)) {
ci.cancel();
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/nexia/core/mixin/entity/EntityMixin.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.nexia.core.mixin.entity;

import com.nexia.core.games.util.LobbyUtil;
import com.nexia.ffa.sky.utilities.FfaAreas;
import com.nexia.ffa.sky.utilities.FfaSkyUtil;
import com.nexia.ffa.sky.utilities.SkyFfaAreas;
import com.nexia.minigames.games.football.FootballGame;
import net.minecraft.commands.CommandSource;
import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -54,8 +55,8 @@ private double modifyVoidY(Entity instance) {

if (instance.level instanceof ServerLevel serverLevel) {

if (FfaAreas.isFfaWorld(serverLevel)) {
voidY = FfaAreas.getVoidY();
if (FfaSkyUtil.INSTANCE.isFfaWorld(serverLevel)) {
voidY = SkyFfaAreas.getVoidY();
}
}

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/nexia/core/mixin/item/BlockItemMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

import com.nexia.base.player.NexiaPlayer;
import com.nexia.ffa.sky.utilities.FfaSkyUtil;
import com.nexia.ffa.uhc.utilities.FfaAreas;
import com.nexia.ffa.sky.utilities.SkyFfaAreas;
import com.nexia.ffa.uhc.utilities.UhcFfaAreas;
import com.nexia.ffa.uhc.utilities.FfaUhcUtil;
import com.nexia.minigames.games.bedwars.areas.BwAreas;
import com.nexia.minigames.games.bedwars.players.BwPlayerEvents;
Expand Down Expand Up @@ -42,13 +43,13 @@ private void beforePlace(BlockPlaceContext context, CallbackInfoReturnable<Inter
return;
}

if (FfaAreas.isFfaWorld(level) && !FfaUhcUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos)) {
if (FfaUhcUtil.INSTANCE.isFfaWorld(level) && !FfaUhcUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos)) {
cir.setReturnValue(InteractionResult.PASS);
nexiaPlayer.refreshInventory();
return;
}

if (com.nexia.ffa.sky.utilities.FfaAreas.isFfaWorld(level) && !FfaSkyUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos)) {
if (FfaSkyUtil.INSTANCE.isFfaWorld(level) && !FfaSkyUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos)) {
cir.setReturnValue(InteractionResult.PASS);
nexiaPlayer.refreshInventory();
}
Expand All @@ -62,7 +63,7 @@ private void afterPlace(BlockPlaceContext context, CallbackInfoReturnable<Intera

BlockPos blockPos = context.getClickedPos();

if (com.nexia.ffa.sky.utilities.FfaAreas.isFfaWorld(player.getLevel())) {
if (FfaSkyUtil.INSTANCE.isFfaWorld(player.getLevel())) {
FfaSkyUtil.afterPlace(nexiaPlayer, blockPos, context.getHand());
}
}
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/com/nexia/core/mixin/item/BowItemMixins.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.nexia.core.mixin.item;

import com.nexia.core.games.util.LobbyUtil;
import com.nexia.base.player.NexiaPlayer;
import com.nexia.core.games.util.LobbyUtil;
import com.nexia.ffa.kits.utilities.FfaKitsUtil;
import com.nexia.ffa.sky.utilities.FfaSkyUtil;
import com.nexia.ffa.uhc.utilities.FfaUhcUtil;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.BowItem;
Expand All @@ -20,9 +23,9 @@ public void preventKitFFAplayers(ItemStack itemStack, Level level, LivingEntity
if(livingEntity instanceof ServerPlayer player){
NexiaPlayer nexiaPlayer = new NexiaPlayer(player);

if(((com.nexia.ffa.kits.utilities.FfaAreas.isFfaWorld(player.level) && com.nexia.ffa.kits.utilities.FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
(com.nexia.ffa.uhc.utilities.FfaAreas.isFfaWorld(player.level) && com.nexia.ffa.uhc.utilities.FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
(com.nexia.ffa.sky.utilities.FfaAreas.isFfaWorld(player.level) && com.nexia.ffa.sky.utilities.FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
if(((FfaKitsUtil.INSTANCE.isFfaWorld(player.level) && FfaKitsUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(FfaUhcUtil.INSTANCE.isFfaWorld(player.level) && FfaUhcUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(FfaSkyUtil.INSTANCE.isFfaWorld(player.level) && FfaSkyUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(player.getLevel().equals(LobbyUtil.lobbyWorld))
) && !player.isCreative()) {
ci.cancel();
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/nexia/core/mixin/item/BucketItemMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import com.nexia.core.NexiaCore;
import com.nexia.core.games.util.PlayerGameMode;
import com.nexia.core.utilities.player.CorePlayerData;
import com.nexia.ffa.uhc.utilities.FfaAreas;
import com.nexia.ffa.uhc.utilities.FfaUhcUtil;
import com.nexia.minigames.games.duels.DuelGameMode;
import com.nexia.minigames.games.duels.util.player.DuelsPlayerData;
Expand Down Expand Up @@ -53,7 +52,7 @@ private void beforePlace(Level level, Player player, InteractionHand interaction

if(!(player instanceof ServerPlayer serverPlayer)) return;
NexiaPlayer nexiaPlayer = new NexiaPlayer(serverPlayer);
if((FfaAreas.isFfaWorld(level) && !FfaUhcUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos3)) || (!player.isCreative() && ((CorePlayerData)PlayerDataManager.getDataManager(NexiaCore.CORE_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(PlayerGameMode.LOBBY) && ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(DuelGameMode.LOBBY))) {
if((FfaUhcUtil.INSTANCE.isFfaWorld(level) && !FfaUhcUtil.INSTANCE.beforeBuild(nexiaPlayer, blockPos3)) || (!player.isCreative() && ((CorePlayerData)PlayerDataManager.getDataManager(NexiaCore.CORE_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(PlayerGameMode.LOBBY) && ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(DuelGameMode.LOBBY))) {
cir.setReturnValue(new InteractionResultHolder<>(InteractionResult.FAIL, player.getItemInHand(interactionHand)));
nexiaPlayer.refreshInventory();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
import com.nexia.core.NexiaCore;
import com.nexia.core.games.util.LobbyUtil;
import com.nexia.base.player.NexiaPlayer;
import com.nexia.ffa.sky.utilities.FfaAreas;
import com.nexia.ffa.sky.utilities.SkyFfaAreas;
import com.nexia.ffa.sky.utilities.FfaSkyUtil;
import com.nexia.ffa.uhc.utilities.FfaUhcUtil;
import com.nexia.minigames.games.duels.DuelGameMode;
import com.nexia.minigames.games.duels.util.player.DuelsPlayerData;
import net.minecraft.server.level.ServerPlayer;
Expand Down Expand Up @@ -39,7 +40,7 @@ private void setPlayer(Level level, Player player, InteractionHand interactionHa
thrower = serverPlayer;
NexiaPlayer nexiaPlayer = new NexiaPlayer(serverPlayer);

if (((FfaAreas.isFfaWorld(serverPlayer.getLevel()) && FfaSkyUtil.INSTANCE.wasInSpawn.contains(serverPlayer.getUUID())) || (serverPlayer.getLevel().equals(LobbyUtil.lobbyWorld))) && !serverPlayer.isCreative()) {
if (((FfaSkyUtil.INSTANCE.isFfaWorld(serverPlayer.getLevel()) && FfaSkyUtil.INSTANCE.wasInSpawn.contains(serverPlayer.getUUID())) || (serverPlayer.getLevel().equals(LobbyUtil.lobbyWorld))) && !serverPlayer.isCreative()) {
cir.setReturnValue(InteractionResultHolder.pass(serverPlayer.getItemInHand(interactionHand)));
nexiaPlayer.refreshInventory();
}
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/com/nexia/core/mixin/item/TridentItemMixin.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.nexia.core.mixin.item;

import com.nexia.base.player.NexiaPlayer;
import com.nexia.base.player.PlayerDataManager;
import com.nexia.core.NexiaCore;
import com.nexia.core.games.util.PlayerGameMode;
import com.nexia.core.utilities.player.CorePlayerData;
import com.nexia.base.player.NexiaPlayer;
import com.nexia.ffa.classic.utilities.FfaAreas;
import com.nexia.ffa.classic.utilities.FfaClassicUtil;
import com.nexia.ffa.kits.utilities.FfaKitsUtil;
import com.nexia.ffa.uhc.utilities.FfaUhcUtil;
import com.nexia.minigames.games.bedwars.players.BwPlayerEvents;
import com.nexia.minigames.games.bedwars.util.BwUtil;
import com.nexia.minigames.games.duels.DuelGameMode;
Expand Down Expand Up @@ -45,9 +47,9 @@ public void changeHoldTime(ItemStack itemStack, Level level, LivingEntity living
if(livingEntity instanceof ServerPlayer player){
NexiaPlayer nexiaPlayer = new NexiaPlayer(player);

if((FfaAreas.isFfaWorld(player.level) && FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
(com.nexia.ffa.kits.utilities.FfaAreas.isFfaWorld(player.level) && com.nexia.ffa.kits.utilities.FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
(com.nexia.ffa.uhc.utilities.FfaAreas.isFfaWorld(player.level) && com.nexia.ffa.uhc.utilities.FfaAreas.isInFfaSpawn(nexiaPlayer)) ||
if((FfaClassicUtil.INSTANCE.isFfaWorld(player.level) && FfaClassicUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(FfaKitsUtil.INSTANCE.isFfaWorld(player.level) && FfaKitsUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(FfaUhcUtil.INSTANCE.isFfaWorld(player.level) && FfaUhcUtil.INSTANCE.isInFfaSpawn(nexiaPlayer)) ||
(((CorePlayerData)PlayerDataManager.getDataManager(NexiaCore.CORE_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(PlayerGameMode.LOBBY) && ((DuelsPlayerData)PlayerDataManager.getDataManager(NexiaCore.DUELS_DATA_MANAGER).get(nexiaPlayer)).gameMode.equals(DuelGameMode.LOBBY))
) { ci.cancel(); }
}
Expand Down
Loading

0 comments on commit 3b89220

Please sign in to comment.