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

Don't throw the async jail exception, we run it sync

Browse Source
This commit is contained in:
graywolf336 2015-06-10 15:31:42 -05:00
parent 806176ca1c
commit 312fe5105b
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,6 @@ import com.graywolf336.jail.events.PrePrisonerReleasedEvent;
import com.graywolf336.jail.events.PrisonerJailedEvent; import com.graywolf336.jail.events.PrisonerJailedEvent;
import com.graywolf336.jail.events.PrisonerReleasedEvent; import com.graywolf336.jail.events.PrisonerReleasedEvent;
import com.graywolf336.jail.events.PrisonerTransferredEvent; import com.graywolf336.jail.events.PrisonerTransferredEvent;
import com.graywolf336.jail.exceptions.AsyncJailingNotSupportedException;
import com.graywolf336.jail.exceptions.AsyncUnJailingNotSupportedException; import com.graywolf336.jail.exceptions.AsyncUnJailingNotSupportedException;
import com.graywolf336.jail.exceptions.JailRequiredException; import com.graywolf336.jail.exceptions.JailRequiredException;
import com.graywolf336.jail.exceptions.PrisonerAlreadyJailedException; import com.graywolf336.jail.exceptions.PrisonerAlreadyJailedException;
@ -86,15 +85,12 @@ public class PrisonerManager {
* @param cell The name of the {@link ICell cell} we are sending this prisoner to * @param cell The name of the {@link ICell cell} we are sending this prisoner to
* @param player The {@link Player player} we are preparing the jail for. * @param player The {@link Player player} we are preparing the jail for.
* @param prisoner The {@link Prisoner prisoner} file. * @param prisoner The {@link Prisoner prisoner} file.
* @throws AsyncJailingNotSupportedException if the method is called from a thread that is <strong>not</strong> the primary one (call it sync).
* @throws JailRequiredException if the jail provided is null. * @throws JailRequiredException if the jail provided is null.
* @throws PrisonerAlreadyJailedException if the prisoner is already jailed. * @throws PrisonerAlreadyJailedException if the prisoner is already jailed.
* @throws PrisonerRequiredException if the prisoner's data provided is null. * @throws PrisonerRequiredException if the prisoner's data provided is null.
* *
*/ */
public void prepareJail(Jail jail, ICell cell, Player player, Prisoner prisoner) throws AsyncJailingNotSupportedException, JailRequiredException, PrisonerAlreadyJailedException, PrisonerRequiredException { public void prepareJail(final Jail jail, ICell cell, final Player player, final Prisoner prisoner) throws JailRequiredException, PrisonerAlreadyJailedException, PrisonerRequiredException {
if(!pl.getServer().isPrimaryThread()) throw new AsyncJailingNotSupportedException();
//Do some checks of whether the passed params are null. //Do some checks of whether the passed params are null.
if(jail == null) if(jail == null)
throw new JailRequiredException("jailing a prisoner"); throw new JailRequiredException("jailing a prisoner");
@ -130,7 +126,12 @@ public class PrisonerManager {
if(prisoner.isOfflinePending()) { if(prisoner.isOfflinePending()) {
pl.getServer().getPluginManager().callEvent(new OfflinePrisonerJailedEvent(jail, cell, prisoner)); pl.getServer().getPluginManager().callEvent(new OfflinePrisonerJailedEvent(jail, cell, prisoner));
}else { }else {
jailPrisoner(jail, cell, player, prisoner); final ICell c = cell;
pl.getServer().getScheduler().runTask(pl, new Runnable() {
public void run() {
jailPrisoner(jail, c, player, prisoner);
}
});
} }
//Get a message ready for broadcasting or logging. //Get a message ready for broadcasting or logging.

21
src/main/java/com/graywolf336/jail/exceptions/AsyncJailingNotSupportedException.java
View File

@ -1,21 +0,0 @@
package com.graywolf336.jail.exceptions;
/**
*
* The exception thrown trying to jail via a thread that is NOT the primary thread.
*
* @author graywolf336
* @since 3.0.0
* @version 1.0.0
*/
public class AsyncJailingNotSupportedException extends Exception {
private static final long serialVersionUID = 2746426914894618352L;
/**
* Creation of an exception from jailing via a thread that is not the primary one.
*
*/
public AsyncJailingNotSupportedException() {
super("Jailing via a thread that is NOT the primary thread is not supported.");
}
}