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

Fix #83, transfers failing due to various errors

Browse Source 
The transfers were failing due to errors. Also fixed an api issue where
the method wasn't very descriptive.
This commit is contained in:
graywolf336 2015-06-30 14:15:35 -05:00
parent 93d8b88bb1
commit 2373338770
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -732,9 +732,9 @@ public class PrisonerManager {
//If the targetCell has a chest //If the targetCell has a chest
if(targetCell.hasChest()) { if(targetCell.hasChest()) {
//Loop through the origin's chest inventory and add it to the target cell's chest //Loop through the origin's chest inventory and add it to the target cell's chest
for(ItemStack i : originCell.getChest().getInventory().getContents()) { for(ItemStack i : originCell.getChest().getInventory().getContents())
targetCell.getChest().getInventory().addItem(i); if(i != null)
} targetCell.getChest().getInventory().addItem(i);
//Clear the origin cell's chest as it is clear now //Clear the origin cell's chest as it is clear now
originCell.getChest().getInventory().clear(); originCell.getChest().getInventory().clear();

8
src/main/java/com/graywolf336/jail/command/subcommands/JailTransferCommand.java
View File

@ -65,12 +65,10 @@ public class JailTransferCommand implements Command {
if(params.getJail() == null) { if(params.getJail() == null) {
sender.sendMessage(Lang.PROVIDEAJAIL.get(Lang.TRANSFERRING)); sender.sendMessage(Lang.PROVIDEAJAIL.get(Lang.TRANSFERRING));
return true; return true;
}else { }else if(!jm.isValidJail(params.getJail())) {
//Check if the jail they did provided is not a valid jail //Check if the jail they did provided is not a valid jail
if(!jm.isValidJail(params.getJail())) { sender.sendMessage(Lang.NOJAIL.get(params.getJail()));
sender.sendMessage(Lang.NOJAIL.get(params.getJail())); return true;
return true;
}
} }
jm.getPlugin().debug("They provided a valid jail, so let's check the target cell."); jm.getPlugin().debug("They provided a valid jail, so let's check the target cell.");

6
src/main/java/com/graywolf336/jail/events/PrePrisonerTransferredEvent.java
View File

@ -18,7 +18,7 @@ import com.graywolf336.jail.beans.Prisoner;
* *
* @author graywolf336 * @author graywolf336
* @since 3.0.0 * @since 3.0.0
* @version 1.0.0 * @version 1.0.1
*/ */
public class PrePrisonerTransferredEvent extends Event implements Cancellable { public class PrePrisonerTransferredEvent extends Event implements Cancellable {
private static final HandlerList handlers = new HandlerList(); private static final HandlerList handlers = new HandlerList();
@ -114,8 +114,8 @@ public class PrePrisonerTransferredEvent extends Event implements Cancellable {
} }
/** Gets whether the prisoner being transferred is online or not. */ /** Gets whether the prisoner being transferred is online or not. */
public boolean isOnline() { public boolean isPlayerOnline() {
return player == null; return player != null;
} }
/** Gets the name of what is transferring this prisoner. */ /** Gets the name of what is transferring this prisoner. */

6
src/main/java/com/graywolf336/jail/listeners/CacheListener.java
View File

@ -75,8 +75,10 @@ public class CacheListener implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void beforeTransferringListener(PrePrisonerTransferredEvent event) { public void beforeTransferringListener(PrePrisonerTransferredEvent event) {
if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) { if(event.isPlayerOnline()) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId()); if(pl.getJailManager().inCache(event.getPlayer().getUniqueId())) {
pl.getJailManager().removeCacheObject(event.getPlayer().getUniqueId());
}
} }
} }