Toiletman

src/main/java/com/nexia/core/mixin/block/DispenserBlockMixin.java

@@ -1,14 +1,11 @@
 package com.nexia.core.mixin.block;
 
 import com.nexia.ffa.FfaUtil;
-import com.nexia.ffa.classic.utilities.FfaClassicUtil;
-import com.nexia.ffa.kits.utilities.FfaKitsUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.GameType;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -25,6 +22,6 @@ public void onUse(BlockState blockState, Level level, BlockPos blockPos, Player
         if(!(player instanceof ServerPlayer))
             return;
 
-        if(FfaUtil.isFfaPlayer(player) && ((ServerPlayer) player).gameMode.getGameModeForPlayer() == GameType.ADVENTURE) { cir.setReturnValue(InteractionResult.FAIL); }
+        if(FfaUtil.isFfaPlayer(player) && !player.isCreative()) { cir.setReturnValue(InteractionResult.FAIL); }
     }
 }

src/main/java/com/nexia/core/utilities/time/ServerTime.java

@@ -91,6 +91,7 @@ public static void everyTick() {
 
         BwGame.tick();
         SkyFfaBlocks.tick();
+        OitcGame.tick();
 
         if (totalTickCount % 5 == 0) {
             FfaClassicUtil.fiveTick();

src/main/java/com/nexia/ffa/kits/FfaKit.java

@@ -23,6 +23,10 @@ public class FfaKit {
     public static final FfaKit ARCHER = new FfaKit("archer", new ItemStack(Items.BOW));
     public static final FfaKit MAGE = new FfaKit("mage", new ItemStack(Items.DRAGON_BREATH));
 
+    public static final FfaKit KIT6 = new FfaKit("kit_6", new ItemStack(Items.BARRIER));
+
+    public static final FfaKit KIT7 = new FfaKit("kit_7", new ItemStack(Items.BARRIER));
+
     public FfaKit(String id, ItemStack item) {
         this.id = id;
         this.item = item;

src/main/java/com/nexia/minigames/games/oitc/OitcGameMode.java

@@ -10,4 +10,4 @@ public class OitcGameMode {
     public OitcGameMode(String id) {
         this.id = id;
     }
-}
+}

src/main/java/com/nexia/minigames/games/oitc/OitcMap.java

@@ -1,17 +1,39 @@
 package com.nexia.minigames.games.oitc;
 
+import com.nexia.core.utilities.pos.EntityPos;
+import net.minecraft.core.BlockPos;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class OitcMap {
 
     public static List<OitcMap> oitcMaps = new ArrayList<>();
 
-    public static List<String> stringOitcMaps = new ArrayList<>();
-
     public String id;
 
-    public static OitcMap CITY = new OitcMap("city");
+    public String name;
+
+    public BlockPos corner1;
+
+    public BlockPos corner2;
+
+    public int maxPlayers;
+    public ArrayList<EntityPos> spawnPositions;
+
+    public static OitcMap CITY = new OitcMap("city", "City", 8, new BlockPos(0, 0, 0), new BlockPos(0, 0, 0),
+            new ArrayList<>(Arrays.asList(
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0),
+                    new EntityPos(0, 80, 0,0,0)
+            ))
+    );
 
 
     public static OitcMap identifyMap(String name) {
@@ -21,10 +43,15 @@ public static OitcMap identifyMap(String name) {
         return null;
     }
 
-    public OitcMap(String id) {
+    public OitcMap(String id, String name, int maxPlayers, BlockPos corner1, BlockPos corner2, ArrayList<EntityPos> spawnPositions) {
         this.id = id;
+        this.name = name;
+        this.maxPlayers = maxPlayers;
+        this.spawnPositions = spawnPositions;
+
+        this.corner1 = corner1;
+        this.corner2 = corner2;
 
-        OitcMap.stringOitcMaps.add(id);
         OitcMap.oitcMaps.add(this);
     }
 }

src/main/java/com/nexia/minigames/games/oitc/util/OitcScoreboard.java

@@ -2,7 +2,6 @@
 
 import com.nexia.core.utilities.chat.LegacyChatFormat;
 import com.nexia.core.utilities.time.ServerTime;
-import com.nexia.core.utilities.time.TickUtil;
 import com.nexia.minigames.games.oitc.OitcGame;
 import com.nexia.minigames.games.oitc.util.player.PlayerDataManager;
 import net.minecraft.network.chat.TextComponent;
@@ -15,6 +14,7 @@
 import net.minecraft.world.scores.Score;
 import net.minecraft.world.scores.Scoreboard;
 import net.minecraft.world.scores.criteria.ObjectiveCriteria;
+import net.notcoded.codelib.util.TickUtil;
 
 import java.util.ArrayList;
 
@@ -31,7 +31,7 @@ public class OitcScoreboard {
             title, ObjectiveCriteria.RenderType.INTEGER);
 
     public static void setUpScoreboard() {
-        for (ServerPlayer player : OitcGame.alive) {
+        for (ServerPlayer player : OitcGame.getViewers()) {
             sendOITCScoreboard(player);
         }
         updateScoreboard();
@@ -53,7 +53,7 @@ public static void updateScoreboard() {
         addLines(lines);
         updateTimer();
 
-        for (ServerPlayer player : OitcGame.alive) {
+        for (ServerPlayer player : OitcGame.getViewers()) {
             updateStats(player);
             sendLines(player);
         }
@@ -134,4 +134,4 @@ public static void removeScoreboardFor(ServerPlayer player) {
         player.connection.send(new ClientboundSetDisplayObjectivePacket(1, null));
     }
 
-}
+}

src/main/java/com/nexia/minigames/games/oitc/util/player/PlayerData.java

@@ -12,14 +12,14 @@ public class PlayerData {
 
     public int kills;
 
-    public int deathTime;
+    public boolean hasDied;
 
     public PlayerData(SavedPlayerData savedData) {
         this.savedData = savedData;
 
         this.gameMode = OitcGameMode.LOBBY;
         this.kills = 0;
-        this.deathTime = 5;
+        this.hasDied = false;
     }
 
-}
+}

src/main/java/com/nexia/minigames/games/skywars/SkywarsGame.java

@@ -424,7 +424,7 @@ public static void death(ServerPlayer victim, DamageSource source){
             victim.destroyVanishingCursedItems();
             victim.inventory.dropAll();
 
-            victimData.savedData.losses++;
+            if(SkywarsGame.winner != accurateVictim) victimData.savedData.losses++;
             SkywarsGame.alive.remove(accurateVictim);
             SkywarsGame.spectator.add(accurateVictim);
             PlayerDataManager.get(victim).gameMode = SkywarsGameMode.SPECTATOR;