fix(forge16): STOP RANDOM LEVEL STUFF

EnvyWare · Oct 26, 2022 · aa44616 · aa44616
1 parent 9800814
commit aa44616
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/forge16/src/main/java/com/envyful/battle/tower/player/BattleTowerAttribute.java b/forge16/src/main/java/com/envyful/battle/tower/player/BattleTowerAttribute.java
@@ -20,6 +20,7 @@
 import com.pixelmonmod.pixelmon.api.pokemon.Pokemon;
 import com.pixelmonmod.pixelmon.api.pokemon.PokemonBuilder;
 import com.pixelmonmod.pixelmon.api.storage.StorageProxy;
+import com.pixelmonmod.pixelmon.api.storage.TrainerPartyStorage;
 import com.pixelmonmod.pixelmon.battles.api.rules.BattleRuleRegistry;
 import com.pixelmonmod.pixelmon.battles.api.rules.BattleRules;
 import com.pixelmonmod.pixelmon.battles.api.rules.teamselection.TeamSelectionRegistry;
@@ -30,7 +31,6 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -111,8 +111,15 @@ public void beginBattle() {
         trainer.setBattleAIMode(BattleAIMode.ADVANCED);
         trainer.setNoAi(true);
         trainer.init(ServerNPCRegistry.trainers.getRandomBaseWithData());
-        trainer.loadPokemon((ArrayList<Pokemon>) randomLeaderTeam.getY());
-        trainer.getPokemonStorage();
+        TrainerPartyStorage pokemonStorage = trainer.getPokemonStorage();
+
+        for(int i = 0; i < 6; ++i) {
+            pokemonStorage.set(i, null);
+        }
+
+        for (Pokemon pokemon : randomLeaderTeam.getY()) {
+            pokemonStorage.add(pokemon);
+        }
 
         this.getParent().getParent().level.addFreshEntity(trainer);