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

Add a black list to storing the player's inventory.

Browse Source
This commit is contained in:
graywolf336 2014-07-14 23:16:05 -05:00
parent a5bf89b07e
commit 9ca8e14e29
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/graywolf336/jail/PrisonerManager.java
View File

@ -1,5 +1,6 @@
package com.graywolf336.jail;
import java.util.List;
import java.util.UUID;
import org.bukkit.GameMode;
@ -135,12 +136,6 @@ public class PrisonerManager {
player.sendMessage(pl.getJailIO().getLanguageString(LangString.JAILEDWITHREASON, new String[] { prisoner.getReason() }));
}
//If the config has inventory deletion, then let's delete it
if(pl.getConfig().getBoolean(Settings.DELETEINVENTORY.getPath(), false)) {
player.getInventory().setArmorContents(null);
player.getInventory().clear();
}
//If the config has releasing them back to their previous position,
//then let's set it in the prisoner data.
if(pl.getConfig().getBoolean(Settings.RELEASETOPREVIOUSPOSITION.getPath(), false)) {
@ -191,6 +186,7 @@ public class PrisonerManager {
if(cell != null) {
//check if we store the inventory
if(pl.getConfig().getBoolean(Settings.JAILEDSTOREINVENTORY.getPath(), true)) {
List<String> blacklist = pl.getConfig().getStringList(Settings.JAILEDINVENTORYBLACKLIST.getPath());
//Check if there is a chest to store our items to and if it is a double chest, if not we will then serialize it
if(cell.hasChest()) {
//Get the chest's inventory and then clear it
@ -202,18 +198,22 @@ public class PrisonerManager {
ItemStack[] armor = player.getInventory().getArmorContents();
for(ItemStack item : inventory) {
if(!Util.isStringInsideList(blacklist, item.getType().toString())) {
int i = chest.firstEmpty();
if(i != -1) {//Check that we have got a free spot, should never happen but just in case
chest.setItem(i, item);
}
}
}
for(ItemStack item : armor) {
if(!Util.isStringInsideList(blacklist, item.getType().toString())) {
int i = chest.firstEmpty();
if(i != -1) {//Check that we have got a free spot, should never happen but just in case
chest.setItem(i, item);
}
}
}
player.getInventory().setArmorContents(null);
player.getInventory().clear();
@ -222,6 +222,18 @@ public class PrisonerManager {
//Updates the cell's signs
cell.update();
}else {
for(ItemStack item : player.getInventory().getContents()) {
if(Util.isStringInsideList(blacklist, item.getType().toString())) {
player.getInventory().remove(item);
}
}
for(ItemStack item : player.getInventory().getArmorContents()) {
if(Util.isStringInsideList(blacklist, item.getType().toString())) {
player.getInventory().remove(item);
}
}
String[] inv = Util.playerInventoryToBase64(player.getInventory());
prisoner.setInventory(inv[0]);
prisoner.setArmor(inv[1]);

4
src/main/java/com/graywolf336/jail/enums/Settings.java
View File

@ -24,7 +24,6 @@ public enum Settings {
CROPTRAMPLINGPROTECTION("jailing.during.cropTramplingProtection"),
DEBUG("system.debug"),
DEFAULTJAIL("jailing.jail.defaultJail"),
DELETEINVENTORY("jailing.jail.deleteInventory"),
ENDERMENPROTECTION("jails.endermenProtection"),
EXPLOSIONPROTECTION("jails.explosionProtection"),
FOODCONTROL("jailing.during.foodControl"),
@ -35,7 +34,8 @@ public enum Settings {
JAILSTICKSTICKS("jailstick.sticks"),
JAILDEFAULTTIME("jailing.jail.defaultTime"),
JAILEDGAMEMODE("jailing.jail.gameMode"),
JAILEDSTOREINVENTORY("jailing.jail.storeInventory"),
JAILEDINVENTORYBLACKLIST("jailing.jail.inventory.blacklist"),
JAILEDSTOREINVENTORY("jailing.jail.inventory.store"),
JAILPAYENABLED("jailpay.enabled"),
JAILPAYITEM("jailpay.item"),
JAILPAYPRICEPERMINUTE ("jailpay.pricePerMinute"),

5
src/main/resources/config.yml
View File

@ -56,11 +56,12 @@ jailing:
commands: []
defaultJail: nearest #the jail nearest to the player
defaultTime: 30m #default the time to 30 minutes, if no time
deleteInventory: false
gameMode: adventure
inventory:
blacklist: ['diamond_block', 'gold_block', 'emerald_block'] #items they aren't allowed to keep
store: true
logToConsole: true
logToProfile: false
storeInventory: true
release:
backToPreviousPosition: false
commands: []