diff --git a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java b/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java index 47b5323..186c3e8 100644 --- a/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java +++ b/src/main/java/rip/tilly/bedwars/playerdata/currentgame/PlayerCurrentGameData.java @@ -50,15 +50,13 @@ public class PlayerCurrentGameData { return upgrade.getCostForLevel(this.upgrades.getOrDefault(upgrade, 0) + 1); } - public void upgrade(Player player, Game game, Upgrade upgrade) { + public void upgrade(Player player, Game game, GameTeam gameTeam, Upgrade upgrade) { this.upgrades.put(upgrade, this.upgrades.getOrDefault(upgrade, 0) + 1); int level = this.upgrades.get(upgrade); - GameTeam gameTeam = game.getTeams().get(this.teamId); - - game.getTeams().stream().filter(team -> team == gameTeam).forEach(team -> team.playingPlayers().forEach(teamMember -> { - teamMember.sendMessage(CC.translate("&6" + player.getName() + " upgraded " + upgrade.getFormattedName() + " to &cTier " + upgrade.getNumberToRomanNumeral(level))); + gameTeam.playingPlayers().forEach(teamPlayer -> { + teamPlayer.sendMessage(CC.translate("&6" + player.getName() + " upgraded " + upgrade.getFormattedName() + " to &cTier " + upgrade.getNumberToRomanNumeral(level))); // System.out.println("11111111111111111111111 - " + player.getName()); this.giveTeamArmor(player, this); @@ -124,7 +122,7 @@ public class PlayerCurrentGameData { break; } - })); + }); } public ArmorType getArmorType(Player player) { diff --git a/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java b/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java index 223977f..46e918b 100644 --- a/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java +++ b/src/main/java/rip/tilly/bedwars/upgrades/UpgradeItem.java @@ -4,6 +4,7 @@ import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import rip.tilly.bedwars.game.Game; +import rip.tilly.bedwars.game.GameTeam; import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData; import rip.tilly.bedwars.utils.CC; import rip.tilly.bedwars.utils.ItemBuilder; @@ -68,7 +69,7 @@ public class UpgradeItem { return itemBuilder.build(); } - public void buy(Player player, int level, Game game, PlayerCurrentGameData playerCurrentGameData) { + public void buy(Player player, int level, Game game, GameTeam gameTeam, PlayerCurrentGameData playerCurrentGameData) { if (!this.canBuy(player, level)) { return; } @@ -96,7 +97,7 @@ public class UpgradeItem { } } - playerCurrentGameData.upgrade(player, game, this.upgrade); + playerCurrentGameData.upgrade(player, game, gameTeam, this.upgrade); } public boolean canBuy(Player player, int level) { diff --git a/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java b/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java index 2d3bff5..dc079d7 100644 --- a/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java +++ b/src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java @@ -5,6 +5,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; import rip.tilly.bedwars.BedWars; import rip.tilly.bedwars.game.Game; +import rip.tilly.bedwars.game.GameTeam; import rip.tilly.bedwars.playerdata.PlayerData; import rip.tilly.bedwars.playerdata.currentgame.PlayerCurrentGameData; import rip.tilly.bedwars.upgrades.Upgrade; @@ -64,7 +65,7 @@ public class UpgradesMenu extends Menu { } if (upgradeItem.canBuy(player, playerCurrentGameData.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1)) { - upgradeItem.buy(player, playerCurrentGameData.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1, game, playerCurrentGameData); + upgradeItem.buy(player, playerCurrentGameData.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1, game, game.getTeams().get(playerCurrentGameData.getTeamId()), playerCurrentGameData); player.updateInventory();