Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
tastybento 2019-04-29 19:43:09 -07:00
commit 17493966d2

View File

@ -117,7 +117,7 @@ public class IslandExpelCommand extends CompositeCommand {
} else if (getIslands().getSpawn(getWorld()).isPresent()){
// Success
user.sendMessage(SUCCESS);
getIslands().spawnTeleport(getWorld(), user.getPlayer());
getIslands().spawnTeleport(getWorld(), target.getPlayer());
return true;
} else if (getIWM().getAddon(getWorld())
.map(gm -> gm.getPlayerCommand()