loganmagnan/bed-wars
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Shops not taking items :D

Browse Source
This commit is contained in:
Luca
2021-11-26 19:09:53 +01:00
parent 5cf80c903f
commit b14b37540b
5 changed files with 91 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/rip/tilly/bedwars/utils/PlayerUtil.java
View File

@ -3,6 +3,7 @@ package rip.tilly.bedwars.utils;
import org.bukkit.GameMode;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.potion.PotionEffect;
public class PlayerUtil {
@ -28,4 +29,17 @@ public class PlayerUtil {
((CraftPlayer) player).getHandle().getDataWatcher().watch(9, (byte) 0);
player.updateInventory();
}
public static void minusAmount(Player p, ItemStack i, int amount) {
if (i.getAmount() - amount <= 0) {
if (p.getInventory().getItemInHand().equals(i)) {
p.getInventory().setItemInHand(null);
} else {
p.getInventory().removeItem(i);
}
return;
}
i.setAmount(i.getAmount() - amount);
p.updateInventory();
}
}

10
src/main/java/rip/tilly/bedwars/utils/menusystem/menu/UpgradesMenu.java
View File

@ -71,15 +71,9 @@ public class UpgradesMenu extends Menu {
return;
}
if (upgradeItem.canBuy(player, teamUpgrades.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1)) {
upgradeItem.buy(player, teamUpgrades.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1, game, gameTeam, teamUpgrades);
upgradeItem.buy(player, teamUpgrades.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1, game, gameTeam, teamUpgrades);
new UpgradesMenu(this.main.getPlayerMenuUtil(player)).open(player);
break;
}
player.sendMessage(CC.translate("&cYou do not have enough diamonds for &c&l" + upgradeItem.getUpgrade().getFormattedName() + " " + upgradeItem.getUpgrade().getNumberToRomanNumeral(teamUpgrades.getLevelForUpgrade(upgradeItem.getUpgrade()) + 1)));
new UpgradesMenu(this.main.getPlayerMenuUtil(player)).open(player);
break;
}