EpicKnarvik97/BlockHunt
EpicKnarvik97/BlockHunt
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

~ Improved #8.

Browse Source
This commit is contained in:
Steffion 2013-10-08 17:52:25 +02:00
parent b577259249
commit 769f2c684e
3 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/nl/Steffion/BlockHunt/ArenaHandler.java
View File

@ -153,35 +153,12 @@ public class ArenaHandler {
.get(ConfigC.shop_blockChooserv1Enabled) == true) { .get(ConfigC.shop_blockChooserv1Enabled) == true) {
if (W.shop.getFile().get( if (W.shop.getFile().get(
player.getName() player.getName()
+ ".blockchooser") != null) { + ".blockchooser") != null
ItemStack shopBlockChooser = new ItemStack( || PermissionsM
Material.getMaterial((String) W.config .hasPerm(
.get(ConfigC.shop_blockChooserv1IDname)), player,
1); Permissions.shopblockchooser,
ItemMeta shopBlockChooser_IM = shopBlockChooser false)) {
.getItemMeta();
shopBlockChooser_IM
.setDisplayName(MessageM
.replaceAll((String) W.config
.get(ConfigC.shop_blockChooserv1Name)));
List<String> lores = W.config
.getFile()
.getStringList(
ConfigC.shop_blockChooserv1Description.location);
List<String> lores2 = new ArrayList<String>();
for (String lore : lores) {
lores2.add(MessageM
.replaceAll(lore));
}
shopBlockChooser_IM.setLore(lores2);
shopBlockChooser
.setItemMeta(shopBlockChooser_IM);
player.getInventory().addItem(
shopBlockChooser);
}
if (!PermissionsM.hasPerm(player,
Permissions.vip, true)) {
ItemStack shopBlockChooser = new ItemStack( ItemStack shopBlockChooser = new ItemStack(
Material.getMaterial((String) W.config Material.getMaterial((String) W.config
.get(ConfigC.shop_blockChooserv1IDname)), .get(ConfigC.shop_blockChooserv1IDname)),

7
src/nl/Steffion/BlockHunt/InventoryHandler.java
View File

@ -5,6 +5,8 @@ import java.util.List;
import nl.Steffion.BlockHunt.Arena.ArenaType; import nl.Steffion.BlockHunt.Arena.ArenaType;
import nl.Steffion.BlockHunt.Managers.MessageM; import nl.Steffion.BlockHunt.Managers.MessageM;
import nl.Steffion.BlockHunt.Managers.PermissionsM;
import nl.Steffion.BlockHunt.PermissionsC.Permissions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
@ -310,8 +312,9 @@ public class InventoryHandler {
shop.setItem(0, shopTokens); shop.setItem(0, shopTokens);
if ((Boolean) W.config.get(ConfigC.shop_blockChooserv1Enabled) == true if ((Boolean) W.config.get(ConfigC.shop_blockChooserv1Enabled) == true
&& (Boolean) W.shop.getFile().get( && ((Boolean) W.shop.getFile().get(
player.getName() + ".blockchooser") == null) { player.getName() + ".blockchooser") == null || !PermissionsM
.hasPerm(player, Permissions.shopblockchooser, false))) {
shop.setItem(1, shopBlockChooser); shop.setItem(1, shopBlockChooser);
} }
if ((Boolean) W.config.get(ConfigC.shop_BlockHuntPassv2Enabled) == true) { if ((Boolean) W.config.get(ConfigC.shop_BlockHuntPassv2Enabled) == true) {

4
src/nl/Steffion/BlockHunt/PermissionsC.java
View File

@ -29,6 +29,7 @@ public class PermissionsC {
leave (main + "leave", PType.PLAYER), leave (main + "leave", PType.PLAYER),
list (main + "list", PType.PLAYER), list (main + "list", PType.PLAYER),
shop (main + "shop", PType.PLAYER), shop (main + "shop", PType.PLAYER),
shopblockchooser (main + "shop.blockchooser", PType.ADMIN),
start (main + "start", PType.MODERATOR), start (main + "start", PType.MODERATOR),
create (main + "create", PType.ADMIN), create (main + "create", PType.ADMIN),
set (main + "set", PType.MODERATOR), set (main + "set", PType.MODERATOR),
@ -36,8 +37,7 @@ public class PermissionsC {
signcreate (main + "signcreate", PType.MODERATOR), signcreate (main + "signcreate", PType.MODERATOR),
remove (main + "remove", PType.ADMIN), remove (main + "remove", PType.ADMIN),
tokens (main + "tokens", PType.ADMIN), tokens (main + "tokens", PType.ADMIN),
allcommands (main + "allcommands", PType.OP), allcommands (main + "allcommands", PType.OP);
vip (main + "vip", PType.ADMIN);
public String perm; public String perm;
public PType type; public PType type;